diff options
| author | 2022-01-18 19:32:26 +0000 | |
|---|---|---|
| committer | 2022-01-18 19:32:26 +0000 | |
| commit | 84f683777965cd39c6035d0b677014e797ad0f0c (patch) | |
| tree | 5f8814f33bd9a9156198b8787fe2e4825c5cf75d | |
| parent | 1b91eb31653851cd93d414a8a8a2de74769f7bcd (diff) | |
| parent | 8051cf324f3c665fdaf1469727a4229b38f4e14b (diff) | |
Merge "Add new permission START_CROSS_PROFILE_ACTIVITIES" am: 0702622783 am: 8051cf324f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1949116
Change-Id: I25565b7a04ac1eac63843f4ec39ce8a0dd347a95
| -rw-r--r-- | core/api/system-current.txt | 1 | ||||
| -rw-r--r-- | core/res/AndroidManifest.xml | 4 | ||||
| -rw-r--r-- | packages/Shell/AndroidManifest.xml | 3 |
3 files changed, 8 insertions, 0 deletions
diff --git a/core/api/system-current.txt b/core/api/system-current.txt index 261cac074984..a8ef47e29d67 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -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"; diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index efa1ca31da84..5fa063a84df4 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -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 --> diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml index 618a37e2e40f..5b9b74a96e1c 100644 --- a/packages/Shell/AndroidManifest.xml +++ b/packages/Shell/AndroidManifest.xml @@ -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" /> |