Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 425dac52 authored by Tyler Gunn's avatar Tyler Gunn
Browse files

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 509ef150)
parent 1923b35e

cmds/telecom/src/com/android/commands/telecom/Telecom.java

+4 −8
Original line number Original line Diff line number Diff line
@@ -95,7 +95,8 @@ public final class Telecom extends BaseCommand { 
                + "telecom set-phone-account-disabled: Disables the given phone account, if it \n"

                + "telecom set-phone-account-disabled: Disables the given phone account, if it \n"

                + " has already been registered with telecom.\n"

                + " has already been registered with telecom.\n"

                + "\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"

                + "\n"

                + "telecom get-default-dialer: Displays the current default dialer. \n"

                + "telecom get-default-dialer: Displays the current default dialer. \n"

                + "\n"

                + "\n"
@@ -254,13 +255,8 @@ public final class Telecom extends BaseCommand { 




    private void runSetDefaultDialer() throws RemoteException {

    private void runSetDefaultDialer() throws RemoteException {

        final String packageName = nextArgRequired();

        final String packageName = nextArgRequired();

        final boolean success = mTelecomService.setDefaultDialer(packageName);

        mTelecomService.setTestDefaultDialer(packageName);

        if (success) {

        System.out.println("Success - " + packageName + " set as override default dialer.");

            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.");

        }

    }

    }





    private void runGetDefaultDialer() throws RemoteException {

    private void runGetDefaultDialer() throws RemoteException {

data/etc/privapp-permissions-platform.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -235,6 +235,7 @@ applications that come with the platform 
        <permission name="android.permission.CALL_PRIVILEGED"/>

        <permission name="android.permission.CALL_PRIVILEGED"/>

        <permission name="android.permission.INTERACT_ACROSS_USERS"/>

        <permission name="android.permission.INTERACT_ACROSS_USERS"/>

        <permission name="android.permission.MANAGE_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_AUDIO_ROUTING" />

        <permission name="android.permission.MODIFY_PHONE_STATE"/>

        <permission name="android.permission.MODIFY_PHONE_STATE"/>

        <permission name="android.permission.STOP_APP_SWITCHES"/>

        <permission name="android.permission.STOP_APP_SWITCHES"/>

telecomm/java/com/android/internal/telecom/ITelecomService.aidl

+5 −0
Original line number Original line Diff line number Diff line
@@ -301,4 +301,9 @@ interface ITelecomService { 




    void setTestAutoModeApp(String packageName);

    void setTestAutoModeApp(String packageName);





    /**

     * @see TelecomServiceImpl#setTestDefaultDialer

     */

    void setTestDefaultDialer(in String packageName);



}
 
}