Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "DO NOT MERGE: HA still appears in Media device list even though it has been unpaired." into sc-v2-dev

Browse Source
This commit is contained in:
tim peng
2021-10-21 11:02:32 +00:00
committed by Android (Google) Code Review
parent 8264da57b7 68dac6c41e
commit 9c0537028d
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java
View File

@@ -106,6 +106,7 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice>
private boolean mIsA2dpProfileConnectedFail = false; private boolean mIsA2dpProfileConnectedFail = false;
private boolean mIsHeadsetProfileConnectedFail = false; private boolean mIsHeadsetProfileConnectedFail = false;
private boolean mIsHearingAidProfileConnectedFail = false; private boolean mIsHearingAidProfileConnectedFail = false;
private boolean mUnpairing = false;
// Group second device for Hearing Aid // Group second device for Hearing Aid
private CachedBluetoothDevice mSubDevice; private CachedBluetoothDevice mSubDevice;
@VisibleForTesting @VisibleForTesting
@@ -402,6 +403,7 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice>
if (state != BluetoothDevice.BOND_NONE) { if (state != BluetoothDevice.BOND_NONE) {
final BluetoothDevice dev = mDevice; final BluetoothDevice dev = mDevice;
if (dev != null) { if (dev != null) {
mUnpairing = true;
final boolean successful = dev.removeBond(); final boolean successful = dev.removeBond();
if (successful) { if (successful) {
releaseLruCache(); releaseLruCache();
@@ -1243,4 +1245,8 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice>
void releaseLruCache() { void releaseLruCache() {
mDrawableCache.evictAll(); mDrawableCache.evictAll();
} }
boolean getUnpairing() {
return mUnpairing;
}
} }

3
packages/SettingsLib/src/com/android/settingslib/bluetooth/HearingAidDeviceManager.java
View File

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