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

Commit cf5cecd8 authored by Matthew Xie's avatar Matthew Xie Committed by Android Git Automerger
Browse files

am 1890fa82: am 79d84930: Merge "Set Bluetooth adapter to PowerOff mode when... 

am 1890fa82: am 79d84930: Merge "Set Bluetooth adapter to PowerOff mode when turnoff with airplane on" into ics-mr1

* commit '1890fa82':
  Set Bluetooth adapter to PowerOff mode when turnoff with airplane on
parents 1bdaa928 1890fa82

core/java/android/server/BluetoothAdapterStateMachine.java

+1 −1
Original line number Diff line number Diff line
@@ -539,7 +539,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;

    }