Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OP_ACTIVATE_VPN should not map to DISALLOW_CONFIG_VPN am: 33d03a9e43

Browse Source 
am: fff6650de4

* commit 'fff6650de4ac847db61ffdf3fbc82a39e3878313':
  OP_ACTIVATE_VPN should not map to DISALLOW_CONFIG_VPN

Change-Id: Id88584fff3f69e554793ea1e99dd491796a470ff
This commit is contained in:
Tony Mak
2016-06-03 10:54:46 +00:00
committed by android-build-merger
parent e667dece62 fff6650de4
commit aefec202de
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/app/AppOpsManager.java
View File

@@ -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