Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f411c0c1 authored Sep 13, 2022 by SongFerng Wang Committed by Automerger Merge Worker Sep 13, 2022

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

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>

parents dd6efb7b 56cd23f2

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -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;
		}

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

+5 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}

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

+3 −0

Original line number	Diff line number	Diff line
		@@ -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;
		}
		}