commit 59bbfa683f3441f3d1c9893aa978e54204cd0a43
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Oct 01 19:37:33 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Oct 01 19:37:33 2024 +0000
tree 72112e60f80464e7b089301f6233325c9e253c62
parent f8f254873d8558d4928553e2f5019dff84a34849
parent 7464a30bd92dc04825460aa83c0e262468153611

Merge "Fixes for errorprone update" into main am: 7464a30bd9

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telecomm/+/3285205

Change-Id: If63d27eac34f8d604aef32efb1d1eee0e8dfd085
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

tests/src/com/android/server/telecom/tests/CallsManagerTest.java

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);