diff options
author | Winson Chung <winsonc@google.com> | 2012-09-11 09:59:39 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-11 09:59:39 -0700 |
commit | db425bbb283d5345616c5bb762b9650a7ff19980 (patch) | |
tree | d11177b4e7a2892e5fcb43a7181f0b123d297719 /packages | |
parent | 9f750af6c178d8abb5c12d34efba599e3d53aea4 (diff) | |
parent | 08b1cc847524f66fd1d8c8d9065bf81bdd1fb04a (diff) | |
download | frameworks_base-db425bbb283d5345616c5bb762b9650a7ff19980.zip frameworks_base-db425bbb283d5345616c5bb762b9650a7ff19980.tar.gz frameworks_base-db425bbb283d5345616c5bb762b9650a7ff19980.tar.bz2 |
Merge "Fixing issue with Airplane Mode. (Bug 7141144)" into jb-mr1-dev
Diffstat (limited to 'packages')
-rw-r--r-- | packages/SystemUI/AndroidManifest.xml | 1 | ||||
-rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsModel.java | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml index 22a97bd..44fb49a 100644 --- a/packages/SystemUI/AndroidManifest.xml +++ b/packages/SystemUI/AndroidManifest.xml @@ -19,6 +19,7 @@ <uses-permission android:name="android.permission.READ_PROFILE" /> <uses-permission android:name="android.permission.READ_CONTACTS" /> <uses-permission android:name="android.permission.CONFIGURE_WIFI_DISPLAY" /> + <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" /> <!-- Networking and telephony --> <uses-permission android:name="android.permission.BLUETOOTH" /> diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsModel.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsModel.java index 0d7540b..2318921 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsModel.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsModel.java @@ -186,7 +186,7 @@ class QuickSettingsModel implements BluetoothStateChangeCallback, // TODO: Sets the view to be "awaiting" if not already awaiting // Change the system setting - Settings.System.putInt(mContext.getContentResolver(), Settings.Global.AIRPLANE_MODE_ON, + Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.AIRPLANE_MODE_ON, enabled ? 1 : 0); // Post the intent |