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

Merge "Add more log for analysis" into tm-qpr-dev am: 2de34a740c am: 56cd23f2b1

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

Change-Id: Ia667b589931bbdbb6bb018bb4f098cdd3de82778
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
SongFerng Wang
2022-09-13 01:35:00 +00:00
committed by Automerger Merge Worker
parent dd6efb7b0a 56cd23f2b1
commit f411c0c1f8
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -398,6 +398,7 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice>
* @param id the group id from the CSIP.
*/
public void setGroupId(int id) {
Log.d(TAG, this.getDevice().getAnonymizedAddress() + " set GroupId " + id);
mGroupId = id;
}

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

@@ -357,8 +357,12 @@ public class CachedBluetoothDeviceManager {
* {@code false}.
*/
public synchronized boolean shouldPairByCsip(BluetoothDevice device, int groupId) {
if (mOngoingSetMemberPair != null || device.getBondState() != BluetoothDevice.BOND_NONE
boolean isOngoingSetMemberPair = mOngoingSetMemberPair != null;
int bondState = device.getBondState();
if (isOngoingSetMemberPair || bondState != BluetoothDevice.BOND_NONE
|| !mCsipDeviceManager.isExistedGroupId(groupId)) {
Log.d(TAG, "isOngoingSetMemberPair: " + isOngoingSetMemberPair
+ " , device.getBondState: " + bondState);
return false;
}

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

@@ -102,9 +102,12 @@ public class CsipDeviceManager {
}
private CachedBluetoothDevice getCachedDevice(int groupId) {
log("getCachedDevice: groupId: " + groupId);
for (int i = mCachedDevices.size() - 1; i >= 0; i--) {
CachedBluetoothDevice cachedDevice = mCachedDevices.get(i);
if (cachedDevice.getGroupId() == groupId) {
log("getCachedDevice: found cachedDevice with the groupId: "
+ cachedDevice.getDevice().getAnonymizedAddress());
return cachedDevice;
}
}