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

Commit 8623fcb5 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Car mode InCallService changes." am: 1d4fcf17 am: 920d3e0f am: bed4e978"

parents 352c7c78 bf7be6de

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

+0 −10
Original line number Diff line number Diff line
@@ -58,7 +58,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";
@@ -99,7 +98,6 @@ public final class Telecom extends BaseCommand { 
                + "<USER_SN>\n"

                + "usage: telecom set-test-call-redirection-app <PACKAGE>\n"

                + "usage: telecom set-test-call-screening-app <PACKAGE>\n"

                + "usage: telecom set-test-auto-mode-app <PACKAGE>\n"

                + "usage: telecom set-phone-acct-suggestion-component <COMPONENT>\n"

                + "usage: telecom add-or-remove-call-companion-app <PACKAGE> <1/0>\n"

                + "usage: telecom register-sim-phone-account <COMPONENT> <ID> <USER_SN>"
@@ -191,9 +189,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;
@@ -305,11 +300,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);

data/etc/privapp-permissions-platform.xml

+3 −1
Original line number Diff line number Diff line
@@ -339,8 +339,10 @@ applications that come with the platform 
        <permission name="android.permission.SYSTEM_CAMERA" />

        <!-- Permission required to test ExplicitHealthCheckServiceImpl. -->

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

        <!-- Permission required for UiModeManager cts test. -->

        <!-- Permission required for UiModeManager CTS test. -->

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

        <!-- Permission required for Telecom car mode CTS tests. -->

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

    </privapp-permissions>



    <privapp-permissions package="com.android.statementservice">

packages/Shell/AndroidManifest.xml

+4 −1
Original line number Diff line number Diff line
@@ -215,9 +215,12 @@ 
    <!-- Permission required for CTS test - CrossProfileAppsHostSideTest -->

    <uses-permission android:name="android.permission.INTERACT_ACROSS_PROFILES"/>



    <!-- Permission requried for CTS test - UiModeManagerTest -->

    <!-- Permission required for CTS test - UiModeManagerTest -->

    <uses-permission android:name="android.permission.ENTER_CAR_MODE_PRIORITIZED"/>



      <!-- Permission required for CTS test - CarModeInCallServiceTest -->

    <uses-permission android:name="android.permission.CONTROL_INCALL_EXPERIENCE"/>



    <application android:label="@string/app_label"

                android:theme="@android:style/Theme.DeviceDefault.DayNight"

                android:defaultToDeviceProtectedStorage="true"

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

+0 −2
Original line number Diff line number Diff line
@@ -314,8 +314,6 @@ interface ITelecomService { 


    void addOrRemoveTestCallCompanionApp(String packageName, boolean isAdded);



    void setTestAutoModeApp(String packageName);



    /**

     * @see TelecomServiceImpl#setSystemDialer

     */