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-plus-aosp

Browse Source
This commit is contained in:
tim peng
2021-10-21 03:26:32 +00:00
committed by Android (Google) Code Review
parent 5800b8601f 78b250599b
commit ae86b08bb7
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,7 +21,6 @@ import android.bluetooth.BluetoothClass;
import android.bluetooth.BluetoothCsipSetCoordinator; import android.bluetooth.BluetoothCsipSetCoordinator;
import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothDevice;
import android.bluetooth.BluetoothHearingAid; import android.bluetooth.BluetoothHearingAid;
import android.bluetooth.BluetoothLeAudio;
import android.bluetooth.BluetoothProfile; import android.bluetooth.BluetoothProfile;
import android.bluetooth.BluetoothUuid; import android.bluetooth.BluetoothUuid;
import android.content.Context; import android.content.Context;
@@ -116,6 +115,7 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice>
private boolean mIsHeadsetProfileConnectedFail = false; private boolean mIsHeadsetProfileConnectedFail = false;
private boolean mIsHearingAidProfileConnectedFail = false; private boolean mIsHearingAidProfileConnectedFail = false;
private boolean mIsLeAudioProfileConnectedFail = false; private boolean mIsLeAudioProfileConnectedFail = false;
private boolean mUnpairing = false;
// Group second device for Hearing Aid // Group second device for Hearing Aid
private CachedBluetoothDevice mSubDevice; private CachedBluetoothDevice mSubDevice;
// Group member devices for the coordinated set // Group member devices for the coordinated set
@@ -457,6 +457,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();
@@ -1387,4 +1388,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