summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cmds/telecom/src/com/android/commands/telecom/Telecom.java12
-rw-r--r--data/etc/privapp-permissions-platform.xml1
-rw-r--r--telecomm/java/com/android/internal/telecom/ITelecomService.aidl5
3 files changed, 10 insertions, 8 deletions
diff --git a/cmds/telecom/src/com/android/commands/telecom/Telecom.java b/cmds/telecom/src/com/android/commands/telecom/Telecom.java
index 1b7fbfe0e32c..052445095afe 100644
--- a/cmds/telecom/src/com/android/commands/telecom/Telecom.java
+++ b/cmds/telecom/src/com/android/commands/telecom/Telecom.java
@@ -95,7 +95,8 @@ public final class Telecom extends BaseCommand {
+ "telecom set-phone-account-disabled: Disables the given phone account, if it \n"
+ " has already been registered with telecom.\n"
+ "\n"
- + "telecom set-default-dialer: Sets the default dialer to the given component. \n"
+ + "telecom set-default-dialer: Sets the override default dialer to the given "
+ + "component; this will override whatever the dialer role is set to. \n"
+ "\n"
+ "telecom get-default-dialer: Displays the current default dialer. \n"
+ "\n"
@@ -254,13 +255,8 @@ public final class Telecom extends BaseCommand {
private void runSetDefaultDialer() throws RemoteException {
final String packageName = nextArgRequired();
- final boolean success = mTelecomService.setDefaultDialer(packageName);
- if (success) {
- System.out.println("Success - " + packageName + " set as default dialer.");
- } else {
- System.out.println("Error - " + packageName + " is not an installed Dialer app, \n"
- + " or is already the default dialer.");
- }
+ mTelecomService.setTestDefaultDialer(packageName);
+ System.out.println("Success - " + packageName + " set as override default dialer.");
}
private void runGetDefaultDialer() throws RemoteException {
diff --git a/data/etc/privapp-permissions-platform.xml b/data/etc/privapp-permissions-platform.xml
index 485add9fa11f..98ef00e34d16 100644
--- a/data/etc/privapp-permissions-platform.xml
+++ b/data/etc/privapp-permissions-platform.xml
@@ -235,6 +235,7 @@ applications that come with the platform
<permission name="android.permission.CALL_PRIVILEGED"/>
<permission name="android.permission.INTERACT_ACROSS_USERS"/>
<permission name="android.permission.MANAGE_USERS"/>
+ <permission name="android.permission.MANAGE_ROLE_HOLDERS"/>
<permission name="android.permission.MODIFY_AUDIO_ROUTING" />
<permission name="android.permission.MODIFY_PHONE_STATE"/>
<permission name="android.permission.STOP_APP_SWITCHES"/>
diff --git a/telecomm/java/com/android/internal/telecom/ITelecomService.aidl b/telecomm/java/com/android/internal/telecom/ITelecomService.aidl
index a814c03ff9ad..5cd46ca936a7 100644
--- a/telecomm/java/com/android/internal/telecom/ITelecomService.aidl
+++ b/telecomm/java/com/android/internal/telecom/ITelecomService.aidl
@@ -301,4 +301,9 @@ interface ITelecomService {
void setTestAutoModeApp(String packageName);
+ /**
+ * @see TelecomServiceImpl#setTestDefaultDialer
+ */
+ void setTestDefaultDialer(in String packageName);
+
}