Merge "Reset the connection pending flag when SCO is disconnected" (d6991884) · Commits · e / os / android_packages_services_Telecomm

src/com/android/server/telecom/BluetoothManager.java

+12 −10

Original line number	Diff line number	Diff line
		@@ -55,21 +55,23 @@ public class BluetoothManager {
		@Override
		public void onReceive(Context context, Intent intent) {
		String action = intent.getAction();

		int bluetoothState = 0;
		if (action.equals(BluetoothHeadset.ACTION_CONNECTION_STATE_CHANGED)) {
		int bluetoothHeadsetState = intent.getIntExtra(BluetoothHeadset.EXTRA_STATE,
		bluetoothState = intent.getIntExtra(BluetoothHeadset.EXTRA_STATE,
		BluetoothHeadset.STATE_DISCONNECTED);
		Log.d(this, "mReceiver: HEADSET_STATE_CHANGED_ACTION");
		Log.d(this, "==> new state: %s ", bluetoothHeadsetState);
		updateBluetoothState();
		Log.d(this, "==> new state: %s ", bluetoothState);
		} else if (action.equals(BluetoothHeadset.ACTION_AUDIO_STATE_CHANGED)) {
		int bluetoothHeadsetAudioState =
		intent.getIntExtra(BluetoothHeadset.EXTRA_STATE,
		bluetoothState = intent.getIntExtra(BluetoothHeadset.EXTRA_STATE,
		BluetoothHeadset.STATE_AUDIO_DISCONNECTED);
		Log.d(this, "mReceiver: HEADSET_AUDIO_STATE_CHANGED_ACTION");
		Log.d(this, "==> new state: %s", bluetoothHeadsetAudioState);
		updateBluetoothState();
		Log.d(this, "==> new state: %s", bluetoothState);
		}
		if (bluetoothState == BluetoothHeadset.STATE_DISCONNECTED \|\|
		bluetoothState == BluetoothHeadset.STATE_AUDIO_DISCONNECTED) {
		mBluetoothConnectionPending = false;
		}
		updateBluetoothState();
		}
		};