Merge ab/AP4A.240925.013 into aosp-main-future
Bug: 370570306
Merged-In: I90b57a86788c61a8f90ec4f7a6528ba68bc85d44
Change-Id: Ibef4cbd4976d3a4a540fe2cda1bea79d3266e866
diff --git a/src/com/android/server/telecom/CallAudioRouteController.java b/src/com/android/server/telecom/CallAudioRouteController.java
index e27535a..bc2c0cb 100644
--- a/src/com/android/server/telecom/CallAudioRouteController.java
+++ b/src/com/android/server/telecom/CallAudioRouteController.java
@@ -1014,7 +1014,7 @@
BluetoothDevice deviceToAdd = mBluetoothRoutes.get(route);
// Only include the lead device for LE audio (otherwise, the routes will show
// two separate devices in the UI).
- if (route.getType() == AudioRoute.TYPE_BLUETOOTH_LE
+ if (deviceToAdd != null && route.getType() == AudioRoute.TYPE_BLUETOOTH_LE
&& getLeAudioService() != null) {
int groupId = getLeAudioService().getGroupId(deviceToAdd);
if (groupId != BluetoothLeAudio.GROUP_ID_INVALID) {
diff --git a/src/com/android/server/telecom/RoleManagerAdapterImpl.java b/src/com/android/server/telecom/RoleManagerAdapterImpl.java
index ded4d9c..55326e8 100644
--- a/src/com/android/server/telecom/RoleManagerAdapterImpl.java
+++ b/src/com/android/server/telecom/RoleManagerAdapterImpl.java
@@ -204,8 +204,8 @@
pw.print("(override ");
pw.print(mOverrideDefaultCallRedirectionApp);
pw.print(") ");
- pw.print(getRoleManagerCallRedirectionApp(Binder.getCallingUserHandle()));
}
+ pw.print(getRoleManagerCallRedirectionApp(Binder.getCallingUserHandle()));
pw.println();
pw.print("DefaultCallScreeningApp: ");
@@ -213,19 +213,19 @@
pw.print("(override ");
pw.print(mOverrideDefaultCallScreeningApp);
pw.print(") ");
- pw.print(getRoleManagerCallScreeningApp(Binder.getCallingUserHandle()));
}
+ pw.print(getRoleManagerCallScreeningApp(Binder.getCallingUserHandle()));
pw.println();
pw.print("DefaultCallCompanionApps: ");
- if (mOverrideCallCompanionApps != null) {
+ if (!mOverrideCallCompanionApps.isEmpty()) {
pw.print("(override ");
pw.print(mOverrideCallCompanionApps.stream().collect(Collectors.joining(", ")));
pw.print(") ");
- List<String> appsInRole = getRoleManagerCallCompanionApps();
- if (appsInRole != null) {
- pw.print(appsInRole.stream().collect(Collectors.joining(", ")));
- }
+ }
+ List<String> appsInRole = getRoleManagerCallCompanionApps();
+ if (!appsInRole.isEmpty()) {
+ pw.print(appsInRole.stream().collect(Collectors.joining(", ")));
}
pw.println();
}
diff --git a/tests/src/com/android/server/telecom/tests/CallsManagerTest.java b/tests/src/com/android/server/telecom/tests/CallsManagerTest.java
index c2acfd6..265d7b2 100644
--- a/tests/src/com/android/server/telecom/tests/CallsManagerTest.java
+++ b/tests/src/com/android/server/telecom/tests/CallsManagerTest.java
@@ -3290,10 +3290,10 @@
Bundle extras = mock(Bundle.class);
when(call.getIntentExtras()).thenReturn(extras);
- final int attachmentDisabledMask = ~0
- ^ CallScreeningService.CallResponse.CALL_COMPOSER_ATTACHMENT_LOCATION
- ^ CallScreeningService.CallResponse.CALL_COMPOSER_ATTACHMENT_SUBJECT
- ^ CallScreeningService.CallResponse.CALL_COMPOSER_ATTACHMENT_PRIORITY;
+ final int attachmentDisabledMask = ~(
+ CallScreeningService.CallResponse.CALL_COMPOSER_ATTACHMENT_LOCATION |
+ CallScreeningService.CallResponse.CALL_COMPOSER_ATTACHMENT_SUBJECT |
+ CallScreeningService.CallResponse.CALL_COMPOSER_ATTACHMENT_PRIORITY);
CallScreeningService.ParcelableCallResponse response =
mock(CallScreeningService.ParcelableCallResponse.class);
when(response.getCallComposerAttachmentsToShow()).thenReturn(attachmentDisabledMask);