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

Commit 8d2d9d75 authored by Tyler Gunn's avatar Tyler Gunn Committed by android-build-merger
Browse files

Merge "Add support for wait-on-handlers command." am: da6d683c am: a3b4985a 

am: 3e086be5

Change-Id: Ib704d3d5c67b987e4daa375c6ca7f2b1a5d8fdbb
parents 39c36cab 3e086be5

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

+12 −2
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import android.content.ComponentName; 
import android.content.Context;

import android.net.Uri;

import android.os.IUserManager;

import android.os.Process;

import android.os.RemoteException;

import android.os.ServiceManager;

import android.os.UserHandle;
@@ -51,6 +50,7 @@ public final class Telecom extends BaseCommand { 
    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_GET_SYSTEM_DIALER = "get-system-dialer";

    private static final String COMMAND_WAIT_ON_HANDLERS = "wait-on-handlers";



    private ComponentName mComponent;

    private String mAccountId;
@@ -69,6 +69,7 @@ public final class Telecom extends BaseCommand { 
                "usage: telecom set-default-dialer <PACKAGE>\n" +

                "usage: telecom get-default-dialer\n" +

                "usage: telecom get-system-dialer\n" +

                "usage: telecom wait-on-handlers\n" +

                "\n" +

                "telecom set-phone-account-enabled: Enables the given phone account, if it has \n" +

                " already been registered with Telecom.\n" +
@@ -80,7 +81,9 @@ public final class Telecom extends BaseCommand { 
                "\n" +

                "telecom get-default-dialer: Displays the current default dialer. \n" +

                "\n" +

                "telecom get-system-dialer: Displays the current system dialer. \n"

                "telecom get-system-dialer: Displays the current system dialer. \n" +

                "\n" +

                "telecom wait-on-handlers: Wait until all handlers finish their work. \n"

                );

    }
@@ -125,6 +128,9 @@ public final class Telecom extends BaseCommand { 
            case COMMAND_GET_SYSTEM_DIALER:

                runGetSystemDialer();

                break;

            case COMMAND_WAIT_ON_HANDLERS:

                runWaitOnHandler();

                break;

            default:

                throw new IllegalArgumentException ("unknown command '" + command + "'");

        }
@@ -192,6 +198,10 @@ public final class Telecom extends BaseCommand { 
        System.out.println(mTelecomService.getSystemDialerPackage());

    }



    private void runWaitOnHandler() throws RemoteException {



    }



    private PhoneAccountHandle getPhoneAccountHandleFromArgs() throws RemoteException{

        final ComponentName component = parseComponentName(nextArgRequired());

        final String accountId = nextArgRequired();

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

+5 −0
Original line number Diff line number Diff line
@@ -259,4 +259,9 @@ interface ITelecomService { 
     * @see TelecomServiceImpl#isOutgoingCallPermitted

     */

    boolean isOutgoingCallPermitted(in PhoneAccountHandle phoneAccountHandle);



    /**

     * @see TelecomServiceImpl#waitOnHandler

     */

    void waitOnHandlers();

}