diff options
author | Christopher Tate <ctate@google.com> | 2012-09-10 15:39:05 -0700 |
---|---|---|
committer | Christopher Tate <ctate@google.com> | 2012-09-10 15:46:17 -0700 |
commit | 6a5929b086a61a955a4a2f43f5fa251e8754ff4a (patch) | |
tree | 14f7dcf6986e314c29660d36f20b69e32ea6dc7c /src/com/android/settings/AirplaneModeEnabler.java | |
parent | 955f3477a910f56132f341f6679c9157b0cd515c (diff) | |
download | packages_apps_Settings-6a5929b086a61a955a4a2f43f5fa251e8754ff4a.zip packages_apps_Settings-6a5929b086a61a955a4a2f43f5fa251e8754ff4a.tar.gz packages_apps_Settings-6a5929b086a61a955a4a2f43f5fa251e8754ff4a.tar.bz2 |
Update Settings app to use new namespace for airplane-mode settings
Bug 7132230
Change-Id: I0253637e6d464afc229cf11ffe69852bf44fe261
Diffstat (limited to 'src/com/android/settings/AirplaneModeEnabler.java')
-rw-r--r-- | src/com/android/settings/AirplaneModeEnabler.java | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/com/android/settings/AirplaneModeEnabler.java b/src/com/android/settings/AirplaneModeEnabler.java index 94ba5a1..d1c591e 100644 --- a/src/com/android/settings/AirplaneModeEnabler.java +++ b/src/com/android/settings/AirplaneModeEnabler.java @@ -22,6 +22,7 @@ import android.database.ContentObserver; import android.os.Handler; import android.os.Message; import android.os.SystemProperties; +import android.os.UserHandle; import android.preference.CheckBoxPreference; import android.preference.Preference; import android.provider.Settings; @@ -75,7 +76,7 @@ public class AirplaneModeEnabler implements Preference.OnPreferenceChangeListene mPhoneStateReceiver.registerIntent(); mCheckBoxPref.setOnPreferenceChangeListener(this); mContext.getContentResolver().registerContentObserver( - Settings.System.getUriFor(Settings.System.AIRPLANE_MODE_ON), true, + Settings.Global.getUriFor(Settings.Global.AIRPLANE_MODE_ON), true, mAirplaneModeObserver); } @@ -86,13 +87,13 @@ public class AirplaneModeEnabler implements Preference.OnPreferenceChangeListene } public static boolean isAirplaneModeOn(Context context) { - return Settings.System.getInt(context.getContentResolver(), - Settings.System.AIRPLANE_MODE_ON, 0) != 0; + return Settings.Global.getInt(context.getContentResolver(), + Settings.Global.AIRPLANE_MODE_ON, 0) != 0; } private void setAirplaneModeOn(boolean enabling) { // Change the system setting - Settings.System.putInt(mContext.getContentResolver(), Settings.System.AIRPLANE_MODE_ON, + Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.AIRPLANE_MODE_ON, enabling ? 1 : 0); // Update the UI to reflect system setting mCheckBoxPref.setChecked(enabling); @@ -100,7 +101,7 @@ public class AirplaneModeEnabler implements Preference.OnPreferenceChangeListene // Post the intent Intent intent = new Intent(Intent.ACTION_AIRPLANE_MODE_CHANGED); intent.putExtra("state", enabling); - mContext.sendBroadcast(intent); + mContext.sendBroadcastAsUser(intent, UserHandle.ALL); } /** |