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

Commit bdf07ae8 authored by Svetoslav Ganov's avatar Svetoslav Ganov Committed by Android (Google) Code Review
Browse files

Merge "Runtime permission attribution improvements" into sc-dev

parents 0b2eeabb 268cad2c

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

+1 −2
Original line number Diff line number Diff line
@@ -827,8 +827,7 @@ public class BasicCallTests extends TelecomSystemTest { 


    private void blockNumberWithAnswer(String phoneNumber, Answer answer) throws Exception {

        when(getBlockedNumberProvider().call(

                anyString(),

                nullable(String.class),

                any(),

                anyString(),

                eq(BlockedNumberContract.SystemContract.METHOD_SHOULD_SYSTEM_BLOCK_NUMBER),

                eq(phoneNumber),

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

+2 −2
Original line number Diff line number Diff line
@@ -458,7 +458,7 @@ public class MissedCallNotifierImplTest extends TelecomTestCase { 
                        CallLog.Calls.PRESENTATION_ALLOWED, CALL_TIMESTAMP)

                .build();



        when(cp.query(anyString(), nullable(String.class), eq(queryUri), nullable(String[].class),

        when(cp.query(any(), eq(queryUri), nullable(String[].class),

                nullable(Bundle.class), nullable(ICancellationSignal.class)))

                .thenReturn(mockMissedCallsCursor);
@@ -528,7 +528,7 @@ public class MissedCallNotifierImplTest extends TelecomTestCase { 
                PRIMARY_USER.getIdentifier());

        IContentProvider cp = getContentProviderForUser(PRIMARY_USER.getIdentifier());



        when(cp.query(anyString(), nullable(String.class), eq(queryUri), nullable(String[].class),

        when(cp.query(any(), eq(queryUri), nullable(String[].class),

                nullable(Bundle.class), nullable(ICancellationSignal.class)))

                .thenReturn(mockMissedCallsCursor);