From 425dac52b039e16f7a52980e43ab2a046a46f54c Mon Sep 17 00:00:00 2001 From: Tyler Gunn Date: Thu, 25 Apr 2019 14:28:47 -0700 Subject: [PATCH] Change command like set-default-dialer to be a test override. RoleManager likes to terminate apps when roles are changed which does not work in CTS tests. We need to use a temp override in Telecom for now. Test: Run the CTS tests over, and over and over again. Bug: 131065482 Change-Id: Id36942f2813abdfa0020ce4805c492a69bd07d0e (cherry picked from commit 509ef150f23531b18fe29ef85337312f54535300) --- .../src/com/android/commands/telecom/Telecom.java | 12 ++++-------- data/etc/privapp-permissions-platform.xml | 1 + .../android/internal/telecom/ITelecomService.aidl | 5 +++++ 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 1b7fbfe0e32cf..052445095afe0 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 485add9fa11fc..98ef00e34d16f 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 + diff --git a/telecomm/java/com/android/internal/telecom/ITelecomService.aidl b/telecomm/java/com/android/internal/telecom/ITelecomService.aidl index a814c03ff9ada..5cd46ca936a73 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); + }