DO NOT MERGE Modify system settings: incorrect UI state

am: 119d589ea5

* commit '119d589ea5aa9c2ccc5164279d718a20d0865f20':
  DO NOT MERGE Modify system settings: incorrect UI state
This commit is contained in:
Svetoslav
2015-12-22 19:42:06 +00:00
committed by android-build-merger

View File

@@ -34,11 +34,9 @@ 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
PM_WRITE_SETTINGS
};
public AppStateWriteSettingsBridge(Context context, ApplicationsState appState, Callback