Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit db425bbb authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

Merge "Fixing issue with Airplane Mode. (Bug 7141144)" into jb-mr1-dev

parents 9f750af6 08b1cc84

packages/SystemUI/AndroidManifest.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -19,6 +19,7 @@ 
    <uses-permission android:name="android.permission.READ_PROFILE" />

    <uses-permission android:name="android.permission.READ_PROFILE" />

    <uses-permission android:name="android.permission.READ_CONTACTS" />

    <uses-permission android:name="android.permission.READ_CONTACTS" />

    <uses-permission android:name="android.permission.CONFIGURE_WIFI_DISPLAY" />

    <uses-permission android:name="android.permission.CONFIGURE_WIFI_DISPLAY" />

    <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />





    <!-- Networking and telephony -->

    <!-- Networking and telephony -->

    <uses-permission android:name="android.permission.BLUETOOTH" />

    <uses-permission android:name="android.permission.BLUETOOTH" />

packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsModel.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -186,7 +186,7 @@ class QuickSettingsModel implements BluetoothStateChangeCallback, 
        // TODO: Sets the view to be "awaiting" if not already awaiting

        // TODO: Sets the view to be "awaiting" if not already awaiting





        // Change the system setting

        // 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);

                                enabled ? 1 : 0);





        // Post the intent

        // Post the intent