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

Commit 7464a30b authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Fixes for errorprone update" into main

parents ca434bbc 53633856

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