Commit 33d03a9e authored Jun 02, 2016 by Tony Mak

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

parent 9ad88ce3

core/java/android/app/AppOpsManager.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -717,7 +717,7 @@ public class AppOpsManager {
		UserManager.DISALLOW_UNMUTE_MICROPHONE, // MUTE_MICROPHONE
		UserManager.DISALLOW_CREATE_WINDOWS, // TOAST_WINDOW
		null, //PROJECT_MEDIA
		UserManager.DISALLOW_CONFIG_VPN, // ACTIVATE_VPN
		null, // ACTIVATE_VPN
		UserManager.DISALLOW_WALLPAPER, // WRITE_WALLPAPER
		null, // ASSIST_STRUCTURE
		null, // ASSIST_SCREENSHOT