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

Commit 8051cf32 authored by Gareth Vaughan's avatar Gareth Vaughan Committed by Automerger Merge Worker
Browse files

Merge "Add new permission START_CROSS_PROFILE_ACTIVITIES" am: 07026227 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1949116

Change-Id: I2060c34e54f975c1257895b1089f76055d510915
parents 3a0e798e 07026227

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -274,6 +274,7 @@ package android { 
    field public static final String SIGNAL_REBOOT_READINESS = "android.permission.SIGNAL_REBOOT_READINESS";

    field public static final String SOUND_TRIGGER_RUN_IN_BATTERY_SAVER = "android.permission.SOUND_TRIGGER_RUN_IN_BATTERY_SAVER";

    field public static final String START_ACTIVITIES_FROM_BACKGROUND = "android.permission.START_ACTIVITIES_FROM_BACKGROUND";

    field public static final String START_CROSS_PROFILE_ACTIVITIES = "android.permission.START_CROSS_PROFILE_ACTIVITIES";

    field public static final String STATUS_BAR_SERVICE = "android.permission.STATUS_BAR_SERVICE";

    field public static final String STOP_APP_SWITCHES = "android.permission.STOP_APP_SWITCHES";

    field public static final String SUBSTITUTE_NOTIFICATION_APP_NAME = "android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME";

core/res/AndroidManifest.xml

+4 −0
Original line number Diff line number Diff line
@@ -2724,6 +2724,10 @@ 
    <permission android:name="android.permission.INTERACT_ACROSS_PROFILES"

        android:protectionLevel="signature|appop" />



    <!-- @SystemApi @hide Allows starting activities across profiles in the same profile group. -->

    <permission android:name="android.permission.START_CROSS_PROFILE_ACTIVITIES"

                android:protectionLevel="signature|role" />



    <!-- Allows configuring apps to have the INTERACT_ACROSS_PROFILES permission so that they can

         interact across profiles in the same profile group.

         @hide -->

packages/Shell/AndroidManifest.xml

+3 −0
Original line number Diff line number Diff line
@@ -340,6 +340,9 @@ 
    <!-- Permission required for CTS test - CrossProfileAppsHostSideTest -->

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



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

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



    <!-- permissions required for CTS test - PhoneStateListenerTest -->

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