Merge "Fixes for errorprone update" into main
diff --git a/tests/src/com/android/server/telecom/tests/CallsManagerTest.java b/tests/src/com/android/server/telecom/tests/CallsManagerTest.java
index ae5e6c1..641aed0 100644
--- a/tests/src/com/android/server/telecom/tests/CallsManagerTest.java
+++ b/tests/src/com/android/server/telecom/tests/CallsManagerTest.java
@@ -3325,10 +3325,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);