drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add support for wait-on-handlers command."

Browse Source 
am: da6d683caa

Change-Id: I71bee35ec1bf6ff4100f6515ea87dcc89312a689
This commit is contained in:
Tyler Gunn
2017-02-08 17:17:30 +00:00
committed by android-build-merger
parent 4929aafc1d da6d683caa
commit a3b4985ad4
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
cmds/telecom/src/com/android/commands/telecom/Telecom.java
View File

@ -20,7 +20,6 @@ import android.content.ComponentName;
import android.content.Context; import android.content.Context;
import android.net.Uri; import android.net.Uri;
import android.os.IUserManager; import android.os.IUserManager;
import android.os.Process;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.ServiceManager; import android.os.ServiceManager;
import android.os.UserHandle; 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_SET_DEFAULT_DIALER = "set-default-dialer";
private static final String COMMAND_GET_DEFAULT_DIALER = "get-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_GET_SYSTEM_DIALER = "get-system-dialer";
private static final String COMMAND_WAIT_ON_HANDLERS = "wait-on-handlers";
private ComponentName mComponent; private ComponentName mComponent;
private String mAccountId; private String mAccountId;
@ -69,6 +69,7 @@ public final class Telecom extends BaseCommand {
"usage: telecom set-default-dialer <PACKAGE>\n" + "usage: telecom set-default-dialer <PACKAGE>\n" +
"usage: telecom get-default-dialer\n" + "usage: telecom get-default-dialer\n" +
"usage: telecom get-system-dialer\n" + "usage: telecom get-system-dialer\n" +
"usage: telecom wait-on-handlers\n" +
"\n" + "\n" +
"telecom set-phone-account-enabled: Enables the given phone account, if it has \n" + "telecom set-phone-account-enabled: Enables the given phone account, if it has \n" +
" already been registered with Telecom.\n" + " already been registered with Telecom.\n" +
@ -80,7 +81,9 @@ public final class Telecom extends BaseCommand {
"\n" + "\n" +
"telecom get-default-dialer: Displays the current default dialer. \n" + "telecom get-default-dialer: Displays the current default dialer. \n" +
"\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: case COMMAND_GET_SYSTEM_DIALER:
runGetSystemDialer(); runGetSystemDialer();
break; break;
case COMMAND_WAIT_ON_HANDLERS:
runWaitOnHandler();
break;
default: default:
throw new IllegalArgumentException ("unknown command '" + command + "'"); throw new IllegalArgumentException ("unknown command '" + command + "'");
} }
@ -192,6 +198,10 @@ public final class Telecom extends BaseCommand {
System.out.println(mTelecomService.getSystemDialerPackage()); System.out.println(mTelecomService.getSystemDialerPackage());
} }
private void runWaitOnHandler() throws RemoteException {
}
private PhoneAccountHandle getPhoneAccountHandleFromArgs() throws RemoteException{ private PhoneAccountHandle getPhoneAccountHandleFromArgs() throws RemoteException{
final ComponentName component = parseComponentName(nextArgRequired()); final ComponentName component = parseComponentName(nextArgRequired());
final String accountId = nextArgRequired(); final String accountId = nextArgRequired();

5
telecomm/java/com/android/internal/telecom/ITelecomService.aidl
View File

@ -259,4 +259,9 @@ interface ITelecomService {
* @see TelecomServiceImpl#isOutgoingCallPermitted * @see TelecomServiceImpl#isOutgoingCallPermitted
*/ */
boolean isOutgoingCallPermitted(in PhoneAccountHandle phoneAccountHandle); boolean isOutgoingCallPermitted(in PhoneAccountHandle phoneAccountHandle);
/**
* @see TelecomServiceImpl#waitOnHandler
*/
void waitOnHandlers();
} }