Merge "[DO NOT MERGE] Modify system settings: incorrect UI state"

This commit is contained in:
Svetoslav Ganov
2015-12-03 22:38:54 +00:00
committed by Gerrit Code Review

View File

@@ -34,11 +34,9 @@ public class AppStateWriteSettingsBridge extends AppStateAppOpsBridge {
private static final String TAG = "AppStateWriteSettingsBridge"; private static final String TAG = "AppStateWriteSettingsBridge";
private static final int APP_OPS_OP_CODE = AppOpsManager.OP_WRITE_SETTINGS; 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_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 = { private static final String[] PM_PERMISSIONS = {
PM_WRITE_SETTINGS, PM_WRITE_SETTINGS
PM_CHANGE_NETWORK_STATE
}; };
public AppStateWriteSettingsBridge(Context context, ApplicationsState appState, Callback public AppStateWriteSettingsBridge(Context context, ApplicationsState appState, Callback