DO NOT MERGE Modify system settings: incorrect UI state
am: 2c02228ad0
* commit '2c02228ad0cd7b9d86050647c679843e829819d4':
DO NOT MERGE Modify system settings: incorrect UI state
diff --git a/src/com/android/settings/applications/AppStateWriteSettingsBridge.java b/src/com/android/settings/applications/AppStateWriteSettingsBridge.java
index 7cdf7ea..ef743fa 100644
--- a/src/com/android/settings/applications/AppStateWriteSettingsBridge.java
+++ b/src/com/android/settings/applications/AppStateWriteSettingsBridge.java
@@ -34,11 +34,9 @@
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
+ PM_WRITE_SETTINGS
};
public AppStateWriteSettingsBridge(Context context, ApplicationsState appState, Callback