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 am: fff6650de4

Browse Source 
am: aefec202de

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

Change-Id: I88bba620c3a3212ebf74ee0f884febc3ec923c1f
This commit is contained in:
Tony Mak
2016-06-03 11:07:38 +00:00
committed by android-build-merger
parent 8216d44ce2 aefec202de
commit 7cf85ffc58
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