Merge "Add adb shell telecom get-system-dialer" into mnc-dev

This commit is contained in:
Yorke Lee
2015-06-15 16:19:41 +00:00
committed by Android (Google) Code Review

View File

@@ -46,6 +46,7 @@ public final class Telecom extends BaseCommand {
private static final String COMMAND_UNREGISTER_PHONE_ACCOUNT = "unregister-phone-account"; 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_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 ComponentName mComponent; private ComponentName mComponent;
private String mAccountId; private String mAccountId;
@@ -60,7 +61,8 @@ public final class Telecom extends BaseCommand {
"usage: telecom register-phone-account <COMPONENT> <ID> <LABEL>\n" + "usage: telecom register-phone-account <COMPONENT> <ID> <LABEL>\n" +
"usage: telecom unregister-phone-account <COMPONENT> <ID>\n" + "usage: telecom unregister-phone-account <COMPONENT> <ID>\n" +
"usage: telecom set-default-dialer <PACKAGE>\n" + "usage: telecom set-default-dialer <PACKAGE>\n" +
"usage: telecom get-default-dialer <PACKAGE>\n" + "usage: telecom get-default-dialer\n" +
"usage: telecom get-system-dialer\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" +
@@ -70,7 +72,9 @@ public final class Telecom extends BaseCommand {
"\n" + "\n" +
"telecom set-default-dialer: Sets the default dialer to the given component. \n" + "telecom set-default-dialer: Sets the default dialer to the given component. \n" +
"\n" + "\n" +
"telecom get-default-dialer: Displays the current default dialer. \n" "telecom get-default-dialer: Displays the current default dialer. \n" +
"\n" +
"telecom get-system-dialer: Displays the current system dialer. \n"
); );
} }
@@ -103,6 +107,9 @@ public final class Telecom extends BaseCommand {
case COMMAND_GET_DEFAULT_DIALER: case COMMAND_GET_DEFAULT_DIALER:
runGetDefaultDialer(); runGetDefaultDialer();
break; break;
case COMMAND_GET_SYSTEM_DIALER:
runGetSystemDialer();
break;
default: default:
throw new IllegalArgumentException ("unknown command '" + command + "'"); throw new IllegalArgumentException ("unknown command '" + command + "'");
} }
@@ -148,6 +155,10 @@ public final class Telecom extends BaseCommand {
System.out.println(mTelecomService.getDefaultDialerPackage()); System.out.println(mTelecomService.getDefaultDialerPackage());
} }
private void runGetSystemDialer() throws RemoteException {
System.out.println(mTelecomService.getSystemDialerPackage());
}
private PhoneAccountHandle getPhoneAccountHandleFromArgs() { private PhoneAccountHandle getPhoneAccountHandleFromArgs() {
final ComponentName component = parseComponentName(nextArgRequired()); final ComponentName component = parseComponentName(nextArgRequired());
final String accountId = nextArgRequired(); final String accountId = nextArgRequired();