PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS

Browse Source 
Change the implementation of AppStateAppOpsBridge to handle multiple
requested permissions in one operation due to the merging of
CHANGE_NETWORK_STATE permission with WRITE_SETTINGS.

This change will affect the packages that will be listed under the
"Write system settings" option in Settings->Apps->[Gear/Cog].

Change-Id: I7d2304d2846b6f505a7b1c3fcf53e7a9bd184ed5
This commit is contained in:
Billy Lau
2015-08-01 18:12:33 +01:00
parent 1adca55ffe
commit 3d9c7fc998
4 changed files with 41 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/applications/AppStateWriteSettingsBridge.java
View File

@@ -34,10 +34,16 @@ public class AppStateWriteSettingsBridge extends AppStateAppOpsBridge {
private static final String TAG = "AppStateWriteSettingsBridge";
private static final int APP_OPS_OP_CODE = AppOpsManager.OP_WRITE_SETTINGS;
private static final String PM_WRITE_SETTINGS = Manifest.permission.WRITE_SETTINGS;
private static final String PM_CHANGE_NETWORK_STATE = Manifest.permission.CHANGE_NETWORK_STATE;
// CHANGE_NETWORK_STATE is now merged with WRITE_SETTINGS
private static final String[] PM_PERMISSIONS = {
PM_WRITE_SETTINGS,
PM_CHANGE_NETWORK_STATE
};
public AppStateWriteSettingsBridge(Context context, ApplicationsState appState, Callback
callback) {
super(context, appState, callback, APP_OPS_OP_CODE, PM_WRITE_SETTINGS);
super(context, appState, callback, APP_OPS_OP_CODE, PM_PERMISSIONS);
}
@Override