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

Commit 59bbfa68 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: If63d27eac34f8d604aef32efb1d1eee0e8dfd085
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f8f25487 7464a30b

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

+4 −4
Original line number Diff line number Diff line
@@ -3325,10 +3325,10 @@ public class CallsManagerTest extends TelecomTestCase { 
        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);