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

Commit e044921d authored by Hall Liu's avatar Hall Liu Committed by Automerger Merge Worker
Browse files

Merge "Add telecom command to stop block suppression" into rvc-dev am: f75aef41 am: a7a352b1 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12108551

Change-Id: I50ec2fe970c6d92f6230dc1ae400f395ab987b0e
parents be2ed83e a7a352b1

cmds/telecom/src/com/android/commands/telecom/Telecom.java

+13 −1
Original line number Diff line number Diff line
@@ -68,6 +68,8 @@ public final class Telecom extends BaseCommand { 
    private static final String COMMAND_UNREGISTER_PHONE_ACCOUNT = "unregister-phone-account";

    private static final String COMMAND_SET_DEFAULT_DIALER = "set-default-dialer";

    private static final String COMMAND_GET_DEFAULT_DIALER = "get-default-dialer";

    private static final String COMMAND_STOP_BLOCK_SUPPRESSION = "stop-block-suppression";



    /**

     * Change the system dialer package name if a package name was specified,

     * Example: adb shell telecom set-system-dialer <PACKAGE>
@@ -115,6 +117,8 @@ public final class Telecom extends BaseCommand { 
                + "usage: telecom set-sim-count <COUNT>\n"

                + "usage: telecom get-sim-config\n"

                + "usage: telecom get-max-phones\n"

                + "usage: telecom stop-block-suppression: Stop suppressing the blocked number"

                        + " provider after a call to emergency services.\n"

                + "usage: telecom set-emer-phone-account-filter <PACKAGE>\n"

                + "\n"

                + "telecom set-phone-account-enabled: Enables the given phone account, if it has"
@@ -207,6 +211,9 @@ public final class Telecom extends BaseCommand { 
            case COMMAND_UNREGISTER_PHONE_ACCOUNT:

                runUnregisterPhoneAccount();

                break;

            case COMMAND_STOP_BLOCK_SUPPRESSION:

                runStopBlockSuppression();

                break;

            case COMMAND_SET_DEFAULT_DIALER:

                runSetDefaultDialer();

                break;
@@ -324,8 +331,13 @@ public final class Telecom extends BaseCommand { 
        System.out.println("Success - " + handle + " unregistered.");

    }



    private void runStopBlockSuppression() throws RemoteException {

        mTelecomService.stopBlockSuppression();

    }



    private void runSetDefaultDialer() throws RemoteException {

        final String packageName = nextArgRequired();

        String packageName = nextArg();

        if ("default".equals(packageName)) packageName = null;

        mTelecomService.setTestDefaultDialer(packageName);

        System.out.println("Success - " + packageName + " set as override default dialer.");

    }

telecomm/java/com/android/internal/telecom/ITelecomService.aidl

+5 −0
Original line number Diff line number Diff line
@@ -276,6 +276,11 @@ interface ITelecomService { 
     */

    boolean setDefaultDialer(in String packageName);



    /**

     * Stop suppressing blocked numbers after a call to emergency services. Shell only.

     */

    void stopBlockSuppression();



    /**

    * @see TelecomServiceImpl#createManageBlockedNumbersIntent

    **/