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

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

am cdffda28: am d69c3675: Merge "Always move Bluetooth Adapter to cold state... 

am cdffda28: am d69c3675: Merge "Always move Bluetooth Adapter to cold state when turn off Bluetooth." into jb-dev

* commit 'cdffda28':
  Always move Bluetooth Adapter to cold state when turn off Bluetooth.
parents fed8441e cdffda28

core/java/android/server/BluetoothAdapterStateMachine.java

+7 −5
Original line number Original line Diff line number Diff line
@@ -441,9 +441,10 @@ final class BluetoothAdapterStateMachine extends StateMachine { 
                        if (mPublicState == BluetoothAdapter.STATE_TURNING_OFF) {

                        if (mPublicState == BluetoothAdapter.STATE_TURNING_OFF) {

                            transitionTo(mHotOff);

                            transitionTo(mHotOff);

                            finishSwitchingOff();

                            finishSwitchingOff();

                            if (!mContext.getResources().getBoolean

                            (com.android.internal.R.bool.config_bluetooth_adapter_quick_switch)) {

                            deferMessage(obtainMessage(TURN_COLD));

                            deferMessage(obtainMessage(TURN_COLD));

                            if (mContext.getResources().getBoolean

                                (com.android.internal.R.bool.config_bluetooth_adapter_quick_switch)) {

                                deferMessage(obtainMessage(TURN_HOT));

                            }

                            }

                        }

                        }

                    } else {

                    } else {
@@ -612,9 +613,10 @@ final class BluetoothAdapterStateMachine extends StateMachine { 
                    removeMessages(POWER_DOWN_TIMEOUT);

                    removeMessages(POWER_DOWN_TIMEOUT);

                    if (!((Boolean) message.obj)) {

                    if (!((Boolean) message.obj)) {

                        transitionTo(mHotOff);

                        transitionTo(mHotOff);

                        if (!mContext.getResources().getBoolean

                            (com.android.internal.R.bool.config_bluetooth_adapter_quick_switch)) {

                        deferMessage(obtainMessage(TURN_COLD));

                        deferMessage(obtainMessage(TURN_COLD));

                        if (mContext.getResources().getBoolean

                            (com.android.internal.R.bool.config_bluetooth_adapter_quick_switch)) {

                            deferMessage(obtainMessage(TURN_HOT));

                        }

                        }

                    } else {

                    } else {

                        if (!isTurningOn) {

                        if (!isTurningOn) {