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

Commit 79d84930 authored by Matthew Xie's avatar Matthew Xie Committed by Android (Google) Code Review
Browse files

Merge "Set Bluetooth adapter to PowerOff mode when turnoff with airplane on" into ics-mr1

parents a618eeb5 f3171fb6

core/java/android/server/BluetoothAdapterStateMachine.java

+1 −1
Original line number Diff line number Diff line
@@ -528,7 +528,7 @@ final class BluetoothAdapterStateMachine extends StateMachine { 
                    }



                    // we turn all the way to PowerOff with AIRPLANE_MODE_ON

                    if (message.what == AIRPLANE_MODE_ON) {

                    if (message.what == AIRPLANE_MODE_ON || mBluetoothService.isAirplaneModeOn()) {

                        // We inform all the per process callbacks

                        allProcessesCallback(false);

                        deferMessage(obtainMessage(AIRPLANE_MODE_ON));

core/java/android/server/BluetoothService.java

+1 −1
Original line number Diff line number Diff line
@@ -1706,7 +1706,7 @@ public class BluetoothService extends IBluetooth.Stub { 
    }



    /* Returns true if airplane mode is currently on */

    private final boolean isAirplaneModeOn() {

    /*package*/ final boolean isAirplaneModeOn() {

        return Settings.System.getInt(mContext.getContentResolver(),

                Settings.System.AIRPLANE_MODE_ON, 0) == 1;

    }