Merge "DO NOT MERGE: HA still appears in Media device list even though it has... (ae86b08b) · Commits · e / os / android_frameworks_base

packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java

+6 −1

Original line number	Diff line number	Diff line
		@@ -21,7 +21,6 @@ import android.bluetooth.BluetoothClass;
		import android.bluetooth.BluetoothCsipSetCoordinator;
		import android.bluetooth.BluetoothDevice;
		import android.bluetooth.BluetoothHearingAid;
		import android.bluetooth.BluetoothLeAudio;
		import android.bluetooth.BluetoothProfile;
		import android.bluetooth.BluetoothUuid;
		import android.content.Context;
		@@ -116,6 +115,7 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice>
		private boolean mIsHeadsetProfileConnectedFail = false;
		private boolean mIsHearingAidProfileConnectedFail = false;
		private boolean mIsLeAudioProfileConnectedFail = false;
		private boolean mUnpairing = false;
		// Group second device for Hearing Aid
		private CachedBluetoothDevice mSubDevice;
		// Group member devices for the coordinated set
		@@ -457,6 +457,7 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice>
		if (state != BluetoothDevice.BOND_NONE) {
		final BluetoothDevice dev = mDevice;
		if (dev != null) {
		mUnpairing = true;
		final boolean successful = dev.removeBond();
		if (successful) {
		releaseLruCache();
		@@ -1387,4 +1388,8 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice>
		void releaseLruCache() {
		mDrawableCache.evictAll();
		}

		boolean getUnpairing() {
		return mUnpairing;
		}
		}

+3 −0

Original line number	Diff line number	Diff line
		@@ -180,6 +180,9 @@ public class HearingAidDeviceManager {
		break;
		case BluetoothProfile.STATE_DISCONNECTED:
		mainDevice = findMainDevice(cachedDevice);
		if (cachedDevice.getUnpairing()) {
		return true;
		}
		if (mainDevice != null) {
		// When main device exists, receiving sub device disconnection
		// To update main device UI