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

Commit cd2dea23 authored by Zoey Chen's avatar Zoey Chen
Browse files

Revert "[Telephony mainline] Move METHOD_* constants from System..." 

Revert "[Telephony mainline] Add SystemApi and NonNull annotation"

Revert "[Telephony Mainline] 1. Move the functionality about blo..."

Revert "[Telephony mainline] Move all METHOD_* constants from Sy..."

Revert "[Telephony mainline] Move the functionality into the cal..."

Revert submission 1175092-1575532679259-3b86bd03

Reason for revert: <Revisit and redesign in S>
Reverted Changes:
I5c4380f93:[Telephony mainline] Move all METHOD_* constants f...
I84bbfc13c:[Telephony mainline] Move METHOD_* constants from ...
I5a53cb416:[Telephony mainline] Move the functionality into t...
I69d1fd77c:[Telephony Mainline] 1. Move the functionality abo...
I619d6ba04:[Telephony mainline] Add SystemApi and NonNull ann...

Change-Id: I98a693f81ac855656f472e764472d95c31016e49
Mergde-In: Iaa06530a4a2411494f55322131d5a1a40b7b3020
parent 31067ae2

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

+1 −1
Original line number Diff line number Diff line
@@ -811,7 +811,7 @@ public class BasicCallTests extends TelecomSystemTest { 
        when(getBlockedNumberProvider().call(

                anyString(),

                anyString(),

                eq(BlockedNumberContract.METHOD_SHOULD_SYSTEM_BLOCK_NUMBER),

                eq(BlockedNumberContract.SystemContract.METHOD_SHOULD_SYSTEM_BLOCK_NUMBER),

                eq(phoneNumber),

                nullable(Bundle.class))).thenAnswer(answer);

    }