Skip to content

Commit 5527ac9

Browse files
sganovandroid-build-merger
authored andcommitted
DO NOT MERGE Modify system settings: incorrect UI state
am: 2c02228 * commit '2c02228ad0cd7b9d86050647c679843e829819d4': DO NOT MERGE Modify system settings: incorrect UI state
2 parents b994c93 + 2c02228 commit 5527ac9

1 file changed

Lines changed: 2 additions & 4 deletions

File tree

src/com/android/settings/applications/AppStateWriteSettingsBridge.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,9 @@ public class AppStateWriteSettingsBridge extends AppStateAppOpsBridge {
3434
private static final String TAG = "AppStateWriteSettingsBridge";
3535
private static final int APP_OPS_OP_CODE = AppOpsManager.OP_WRITE_SETTINGS;
3636
private static final String PM_WRITE_SETTINGS = Manifest.permission.WRITE_SETTINGS;
37-
private static final String PM_CHANGE_NETWORK_STATE = Manifest.permission.CHANGE_NETWORK_STATE;
38-
// CHANGE_NETWORK_STATE is now merged with WRITE_SETTINGS
37+
3938
private static final String[] PM_PERMISSIONS = {
40-
PM_WRITE_SETTINGS,
41-
PM_CHANGE_NETWORK_STATE
39+
PM_WRITE_SETTINGS
4240
};
4341

4442
public AppStateWriteSettingsBridge(Context context, ApplicationsState appState, Callback

0 commit comments

Comments
 (0)