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

Merge "Incorrect summary for the carkit device" into sc-dev am: 53241f6144

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13911070

Change-Id: I68d9cd51e11c73e86d831224a94415808285cd44
This commit is contained in:
tim peng
2021-03-19 08:25:51 +00:00
committed by Automerger Merge Worker
parent dbf31b5ffe 53241f6144
commit 2117346c65
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1006,7 +1006,7 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice>
private boolean isProfileConnectedFail() {
return mIsA2dpProfileConnectedFail || mIsHearingAidProfileConnectedFail
|| mIsHeadsetProfileConnectedFail;
|| (!isConnectedSapDevice() && mIsHeadsetProfileConnectedFail);
}
/**
@@ -1149,6 +1149,12 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice>
BluetoothProfile.STATE_CONNECTED;
}
private boolean isConnectedSapDevice() {
SapProfile sapProfile = mProfileManager.getSapProfile();
return sapProfile != null && sapProfile.getConnectionStatus(mDevice)
== BluetoothProfile.STATE_CONNECTED;
}
public CachedBluetoothDevice getSubDevice() {
return mSubDevice;
}

4
packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothProfileManager.java
View File

@@ -441,6 +441,10 @@ public class LocalBluetoothProfileManager {
return mHearingAidProfile;
}
SapProfile getSapProfile() {
return mSapProfile;
}
@VisibleForTesting
HidProfile getHidProfile() {
return mHidProfile;