Merge "Always move Bluetooth Adapter to cold state when turn off Bluetooth." into jb-dev (d69c3675) · Commits · e / os / android_frameworks_base

core/java/android/server/BluetoothAdapterStateMachine.java

+7 −5

Original line number	Diff line number	Diff line
		@@ -441,9 +441,10 @@ final class BluetoothAdapterStateMachine extends StateMachine {
		if (mPublicState == BluetoothAdapter.STATE_TURNING_OFF) {
		transitionTo(mHotOff);
		finishSwitchingOff();
		if (!mContext.getResources().getBoolean
		(com.android.internal.R.bool.config_bluetooth_adapter_quick_switch)) {
		deferMessage(obtainMessage(TURN_COLD));
		if (mContext.getResources().getBoolean
		(com.android.internal.R.bool.config_bluetooth_adapter_quick_switch)) {
		deferMessage(obtainMessage(TURN_HOT));
		}
		}
		} else {
		@@ -612,9 +613,10 @@ final class BluetoothAdapterStateMachine extends StateMachine {
		removeMessages(POWER_DOWN_TIMEOUT);
		if (!((Boolean) message.obj)) {
		transitionTo(mHotOff);
		if (!mContext.getResources().getBoolean
		(com.android.internal.R.bool.config_bluetooth_adapter_quick_switch)) {
		deferMessage(obtainMessage(TURN_COLD));
		if (mContext.getResources().getBoolean
		(com.android.internal.R.bool.config_bluetooth_adapter_quick_switch)) {
		deferMessage(obtainMessage(TURN_HOT));
		}
		} else {
		if (!isTurningOn) {