OSDN Git Service

(root) / android-x86 / frameworks-base.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 9ad88ce) | patch
OP_ACTIVATE_VPN should not map to DISALLOW_CONFIG_VPN
authorTony Mak <tonymak@google.com>
Thu, 2 Jun 2016 14:01:16 +0000 (15:01 +0100)
committerTony Mak <tonymak@google.com>
Fri, 3 Jun 2016 10:06:06 +0000 (10:06 +0000)
commit33d03a9e435eb474e3bdd3e958943e0057866477
tree1511210a2819221f0aa15d92d98e04c7d0ae8c8ftree | snapshot
parent9ad88ce3fe653ddd6cc52c82b15ed7285de08ac6commit | diff
OP_ACTIVATE_VPN should not map to DISALLOW_CONFIG_VPN

They are two different things.
OP_ACTIVATE_VPN means can we allow a vpn app to establish without user
interaction while DISALLOW_CONFIG_VPN means can the user modify vpn
config.

Testing:
1. Turn on DISALLOW_CONFIG_VPN, user cannot modify vpn config through
   setting
2. Turn on DISALLOW_CONFIG_VPN, Dpm.setAlwaysOnVpn works.
3. Reboot after 2, vpn established automatically.

Bug: 29086229
Change-Id: I24899d6c7f0dd62bf441a44c6ee66fee35973a11
core/java/android/app/AppOpsManager.java diff | blob | history
frameworks/base
About OSDN
Find Software
Develop Software
Help