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

Commit 9d03c0c8 authored by Hall Liu's avatar Hall Liu Committed by Gerrit Code Review
Browse files

Merge "Make test provider use int for blocked number status"

parents 47e5b6b4 5855535b

tests/telephonytests/src/com/android/internal/telephony/TelephonyTest.java

+4 −2
Original line number Original line Diff line number Diff line
@@ -528,8 +528,10 @@ public abstract class TelephonyTest { 
            switch (method) {

            switch (method) {

                case BlockedNumberContract.SystemContract.METHOD_SHOULD_SYSTEM_BLOCK_NUMBER:

                case BlockedNumberContract.SystemContract.METHOD_SHOULD_SYSTEM_BLOCK_NUMBER:

                    Bundle bundle = new Bundle();

                    Bundle bundle = new Bundle();

                    bundle.putBoolean(BlockedNumberContract.RES_NUMBER_IS_BLOCKED,

                    int blockStatus = mBlockedNumbers.contains(arg)

                            mBlockedNumbers.contains(arg));

                            ? BlockedNumberContract.STATUS_BLOCKED_IN_LIST

                            : BlockedNumberContract.STATUS_NOT_BLOCKED;

                    bundle.putInt(BlockedNumberContract.RES_BLOCK_STATUS, blockStatus);

                    return bundle;

                    return bundle;

                case BlockedNumberContract.SystemContract.METHOD_NOTIFY_EMERGENCY_CONTACT:

                case BlockedNumberContract.SystemContract.METHOD_NOTIFY_EMERGENCY_CONTACT:

                    mNumEmergencyContactNotifications++;

                    mNumEmergencyContactNotifications++;