diff options
| author | Michael W <baddaemon87@gmail.com> | 2016-04-15 10:40:45 +0200 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2016-04-18 01:07:46 -0700 |
| commit | 356312084396351f866973385a42ca9327ab827c (patch) | |
| tree | dde8050abc2e704748334135cbe6baad1a8e5627 /src/com/android/settings/DevelopmentSettings.java | |
| parent | 76997a7856c5185c143088268d76bd760cf67a89 (diff) | |
| download | packages_apps_Settings-356312084396351f866973385a42ca9327ab827c.tar.gz packages_apps_Settings-356312084396351f866973385a42ca9327ab827c.tar.bz2 packages_apps_Settings-356312084396351f866973385a42ca9327ab827c.zip | |
Settings: Move ADB_ENABLED to "Global"
ADB_ENABLED is in Global now, so move it there
-> Reduces "adb_enabled has moved from x to y" messages
Change-Id: Id5a7fb1c270e95d2c24c3cd60ddca71890bda3be
Diffstat (limited to 'src/com/android/settings/DevelopmentSettings.java')
| -rw-r--r-- | src/com/android/settings/DevelopmentSettings.java | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java index 10f650ee6..3054cec52 100644 --- a/src/com/android/settings/DevelopmentSettings.java +++ b/src/com/android/settings/DevelopmentSettings.java @@ -845,10 +845,10 @@ public class DevelopmentSettings extends SettingsPreferenceFragment if (Integer.valueOf(newValue.toString()) < 2 && !oldValue.equals(newValue) && "1".equals(SystemProperties.get("service.adb.root", "0"))) { SystemProperties.set("service.adb.root", "0"); - Settings.Secure.putInt(getActivity().getContentResolver(), - Settings.Secure.ADB_ENABLED, 0); - Settings.Secure.putInt(getActivity().getContentResolver(), - Settings.Secure.ADB_ENABLED, 1); + Settings.Global.putInt(getActivity().getContentResolver(), + Settings.Global.ADB_ENABLED, 0); + Settings.Global.putInt(getActivity().getContentResolver(), + Settings.Global.ADB_ENABLED, 1); } updateRootAccessOptions(); } @@ -858,10 +858,10 @@ public class DevelopmentSettings extends SettingsPreferenceFragment SystemProperties.set(ROOT_ACCESS_PROPERTY, "0"); if (!oldValue.equals("0") && "1".equals(SystemProperties.get("service.adb.root", "0"))) { SystemProperties.set("service.adb.root", "0"); - Settings.Secure.putInt(getActivity().getContentResolver(), - Settings.Secure.ADB_ENABLED, 0); - Settings.Secure.putInt(getActivity().getContentResolver(), - Settings.Secure.ADB_ENABLED, 1); + Settings.Global.putInt(getActivity().getContentResolver(), + Settings.Global.ADB_ENABLED, 0); + Settings.Global.putInt(getActivity().getContentResolver(), + Settings.Global.ADB_ENABLED, 1); } updateRootAccessOptions(); } |