resolved conflicts for merge of 79a5307a to master (aa4b235d) · Commits · e / os / android_frameworks_base

core/java/android/server/BluetoothA2dpService.java

+8 −13

Original line number	Diff line number	Diff line
		@@ -65,7 +65,6 @@ public class BluetoothA2dpService extends IBluetoothA2dp.Stub {
		private final BluetoothService mBluetoothService;
		private final BluetoothAdapter mAdapter;
		private int mTargetA2dpState;
		private boolean mAdjustedPriority = false;
		private BluetoothDevice mPlayingA2dpDevice;

		private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
		@@ -334,7 +333,10 @@ public class BluetoothA2dpService extends IBluetoothA2dp.Stub {

		String path = mBluetoothService.getObjectPathFromAddress(device.getAddress());

		// State is DISCONNECTED
		// State is DISCONNECTED and we are connecting.
		if (getPriority(device) < BluetoothA2dp.PRIORITY_AUTO_CONNECT) {
		setPriority(device, BluetoothA2dp.PRIORITY_AUTO_CONNECT);
		}
		handleSinkStateChange(device, state, BluetoothA2dp.STATE_CONNECTING);

		if (!connectSinkNative(path)) {
		@@ -513,14 +515,10 @@ public class BluetoothA2dpService extends IBluetoothA2dp.Stub {
		mTargetA2dpState = -1;

		if (getPriority(device) > BluetoothA2dp.PRIORITY_OFF &&
		state == BluetoothA2dp.STATE_CONNECTING \|\|
		state == BluetoothA2dp.STATE_CONNECTED) {
		// We have connected or attempting to connect.
		// Bump priority
		setPriority(device, BluetoothA2dp.PRIORITY_AUTO_CONNECT);
		}

		if (state == BluetoothA2dp.STATE_CONNECTED) {
		// We will only have 1 device with AUTO_CONNECT priority
		// To be backward compatible set everyone else to have PRIORITY_ON
		adjustOtherSinkPriorities(device);
		@@ -547,15 +545,12 @@ public class BluetoothA2dpService extends IBluetoothA2dp.Stub {
		}

		private void adjustOtherSinkPriorities(BluetoothDevice connectedDevice) {
		if (!mAdjustedPriority) {
		for (BluetoothDevice device : mAdapter.getBondedDevices()) {
		if (getPriority(device) >= BluetoothA2dp.PRIORITY_AUTO_CONNECT &&
		!device.equals(connectedDevice)) {
		setPriority(device, BluetoothA2dp.PRIORITY_ON);
		}
		}
		mAdjustedPriority = true;
		}
		}

		private boolean checkSinkSuspendState(int state) {

core/java/com/android/internal/util/HierarchicalStateMachine.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -1291,6 +1291,14 @@ public class HierarchicalStateMachine {
		mHsmHandler.sendMessageAtFrontOfQueue(msg);
		}

		/**
		* Removes a message from the message queue.
		* Protected, may only be called by instances of HierarchicalStateMachine.
		*/
		protected final void removeMessages(int what) {
		mHsmHandler.removeMessages(what);
		}

		/**
		* Conditionally quit the looper and stop execution.
		*