Merge "Fix failing tests in CachedBluetoothDeviceManagerTest" into main (e0319bb4) · Commits · e / os / android_frameworks_base

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

+27 −39

Original line number	Diff line number	Diff line
		@@ -337,20 +337,9 @@ public class HearingAidDeviceManager {
		return null;
		}

		private boolean isLeAudioHearingAid(CachedBluetoothDevice cachedDevice) {
		List<LocalBluetoothProfile> profiles = cachedDevice.getProfiles();
		boolean supportLeAudio = profiles.stream().anyMatch(p -> p instanceof LeAudioProfile);
		boolean supportHapClient = profiles.stream().anyMatch(p -> p instanceof HapClientProfile);
		return supportLeAudio && supportHapClient;
		}

		private boolean isAshaHearingAid(CachedBluetoothDevice cachedDevice) {
		return cachedDevice.getProfiles().stream().anyMatch(p -> p instanceof HearingAidProfile);
		}

		private HearingAidInfo generateHearingAidInfo(CachedBluetoothDevice cachedDevice) {
		final LocalBluetoothProfileManager profileManager = mBtManager.getProfileManager();
		if (isAshaHearingAid(cachedDevice)) {

		final HearingAidProfile asha = profileManager.getHearingAidProfile();
		if (asha == null) {
		Log.w(TAG, "HearingAidProfile is not supported on this device");
		@@ -364,8 +353,7 @@ public class HearingAidDeviceManager {
		return infoBuilder.build();
		}
		}
		}
		if (isLeAudioHearingAid(cachedDevice)) {

		final HapClientProfile hapClientProfile = profileManager.getHapClientProfile();
		final LeAudioProfile leAudioProfile = profileManager.getLeAudioProfile();
		if (hapClientProfile == null \|\| leAudioProfile == null) {
		@@ -381,7 +369,7 @@ public class HearingAidDeviceManager {
		return infoBuilder.build();
		}
		}
		}

		return null;
		}