| edfeaace61ea13c72325abc0b289dbe875d80f9a |
|
20-Jan-2017 |
Robin Lee <rgl@google.com> |
resolve merge conflicts of cb1968148a to master
Test: make RunSettingsRoboTests
Change-Id: I436af9f0415b9ad7ea0ea53f4f68d337fdbaa0aa
|
| 03159e4c85991fb6e4f1e016cdaf7f8947386c50 |
|
17-Jan-2017 |
insight.lee <insight.lee@lge.com> |
Clear VPN after Clear credentials if VPN is being established
1. There is no way to disconnect VPN after 'Clear credentials'
without removing whole Internet connection because VPN profile to
disconnect is removed when Clear credentials.
2. This commit checks whether VPN is being established or not when
Clear credentials and disconnect VPN if VPN is being established.
Lastly, this shows a toast message to inform VPN disconnected.
Test: manual - took a photo
Signed-off-by : Sungmin Lee <insight.lee@lge.com>
Bug: 29093779
Change-Id: Id5ea01c8731b3b0fca2a31d9d84e8c103952b377
/packages/apps/Settings/src/com/android/settings/vpn2/VpnUtils.java
|
| fc018e467279f8d54aee7eba837ef2d604d795c1 |
|
09-Jan-2017 |
Bartosz Fabianowski <bartfab@google.com> |
Add Always on VPN to Privacy Settings page
This CL adds information about always-on VPNs to the Enterprise
Privacy Settings page.
Test: make RunSettingsRoboTests
Bug: 32692748
Change-Id: I2b59e2ec4c55308b323aaa478cd9c847fe0b4b55
/packages/apps/Settings/src/com/android/settings/vpn2/VpnUtils.java
|
| e7347dd8c02b67cb422765b947b398aa4dea9eb0 |
|
16-Dec-2016 |
Robin Lee <rgl@google.com> |
Implement always-on VPN separate lockdown setting
Allows Settings to control whether always-on VPN is required for the
connection to complete, or if it is offered on a best-efforts basis.
Change-Id: I5eb273a99e7559adc66b05e647c9130a819f99d4
Test: runtest -x tests/app/src/com/android/settings/vpn2/VpnTests.java
Fix: 32420810
/packages/apps/Settings/src/com/android/settings/vpn2/VpnUtils.java
|
| b6f787c4df8e111bdee75062c6a38f606c876858 |
|
05-Jul-2016 |
Robin Lee <rgl@google.com> |
Show a disclaimer about enabling vpn lockdown
Lockdown is now the default option, not best-effort mode. It's easier
to shoot oneself in the foot now so we'll show a warning to explain that
before switching it on.
Bug: 29052115
Bug: 29076208
Test: com.android.settings.vpn2.AppSettingsTest
Change-Id: Ia6845e6a7d57baa5476b8a021fb1255fd74aabea
/packages/apps/Settings/src/com/android/settings/vpn2/VpnUtils.java
|
| 6005aefd44ca073b4c53ceb912b72c0215072799 |
|
17-Mar-2016 |
Victor Chang <vichang@google.com> |
Remove VPN Overflow menu
- Move always-on option for legacy vpn into the legacy vpn config page
- This implementation doesn't show dialogue when replacing existing always-on vpn
- Continue to disable lockdown option for legacy vpn when "persist.radio.imsregrequired" is true.
Not applying to vpn app
- Force to save account info when legacy vpn is always-on
- When legacy vpn is always-on, don't try to connect. (Otherwise, an exception is thrown)
TODO: Remove EXTRA_PICK_LOCKDOWN in LockdownVpnTracker in framework
Bug: 26950700
Change-Id: Ia80669359c0b7cdb955c84937156c020ac6e9af5
/packages/apps/Settings/src/com/android/settings/vpn2/VpnUtils.java
|
| 16da2aa45000dd32213a3d84baacc82cd2b16e5f |
|
11-Mar-2016 |
Victor Chang <vichang@google.com> |
Vpn settings per vpn
This CL adds a setting for each VPN
- When no_config_vpn user restriction is applied, user can't change anything in the page
- Launch the subsetting activity in the corresponding user to unlock keystore and force work challenge
- Show dialog when user replace always-on-VPN package
- When forget VPN, unset always-on-vpn
TODO: show per-VPN status in VPN list
Change-Id: Ica360ea44117db6a4ecfaed1eec6c188189c246c
/packages/apps/Settings/src/com/android/settings/vpn2/VpnUtils.java
|