diff --git a/cmds/telecom/src/com/android/commands/telecom/Telecom.java b/cmds/telecom/src/com/android/commands/telecom/Telecom.java index c9f069d62003f..5ffe2f2c2766a 100644 --- a/cmds/telecom/src/com/android/commands/telecom/Telecom.java +++ b/cmds/telecom/src/com/android/commands/telecom/Telecom.java @@ -59,7 +59,6 @@ public final class Telecom extends BaseCommand { private static final String COMMAND_SET_TEST_CALL_SCREENING_APP = "set-test-call-screening-app"; private static final String COMMAND_ADD_OR_REMOVE_CALL_COMPANION_APP = "add-or-remove-call-companion-app"; - private static final String COMMAND_SET_TEST_AUTO_MODE_APP = "set-test-auto-mode-app"; private static final String COMMAND_SET_PHONE_ACCOUNT_SUGGESTION_COMPONENT = "set-phone-acct-suggestion-component"; private static final String COMMAND_UNREGISTER_PHONE_ACCOUNT = "unregister-phone-account"; @@ -100,7 +99,6 @@ public final class Telecom extends BaseCommand { + "\n" + "usage: telecom set-test-call-redirection-app \n" + "usage: telecom set-test-call-screening-app \n" - + "usage: telecom set-test-auto-mode-app \n" + "usage: telecom set-phone-acct-suggestion-component \n" + "usage: telecom add-or-remove-call-companion-app <1/0>\n" + "usage: telecom register-sim-phone-account " @@ -192,9 +190,6 @@ public final class Telecom extends BaseCommand { case COMMAND_ADD_OR_REMOVE_CALL_COMPANION_APP: runAddOrRemoveCallCompanionApp(); break; - case COMMAND_SET_TEST_AUTO_MODE_APP: - runSetTestAutoModeApp(); - break; case COMMAND_SET_PHONE_ACCOUNT_SUGGESTION_COMPONENT: runSetTestPhoneAcctSuggestionComponent(); break; @@ -306,11 +301,6 @@ public final class Telecom extends BaseCommand { mTelecomService.addOrRemoveTestCallCompanionApp(packageName, isAddedBool); } - private void runSetTestAutoModeApp() throws RemoteException { - final String packageName = nextArg(); - mTelecomService.setTestAutoModeApp(packageName); - } - private void runSetTestPhoneAcctSuggestionComponent() throws RemoteException { final String componentName = nextArg(); mTelecomService.setTestPhoneAcctSuggestionComponent(componentName); diff --git a/data/etc/privapp-permissions-platform.xml b/data/etc/privapp-permissions-platform.xml index 9064abf6ba366..375b35ca24988 100644 --- a/data/etc/privapp-permissions-platform.xml +++ b/data/etc/privapp-permissions-platform.xml @@ -329,8 +329,10 @@ applications that come with the platform - + + + diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml index 13fc881624ec5..092eedf87f9d6 100644 --- a/packages/Shell/AndroidManifest.xml +++ b/packages/Shell/AndroidManifest.xml @@ -207,9 +207,12 @@ - + + + +