diff options
| author | 2022-01-18 19:48:27 +0000 | |
|---|---|---|
| committer | 2022-01-18 19:48:27 +0000 | |
| commit | 4b3b486d3fcf27597ec5b4941d90abcb61c9cf49 (patch) | |
| tree | f6de7411df4e0b489e8d8ccbeb14c29fe73f996b | |
| parent | e00127f167450049c98cf6cb7c0c03ce4a85e806 (diff) | |
| parent | 84f683777965cd39c6035d0b677014e797ad0f0c (diff) | |
Merge "Add new permission START_CROSS_PROFILE_ACTIVITIES" am: 0702622783 am: 8051cf324f am: 84f6837779
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1949116
Change-Id: If45a86dfa3afe1c42e3efae560920c717c79f918
| -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 7702f2df7319..bfb4a1756d4c 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -275,6 +275,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 d018c809d2f8..4b4a0a7fa789 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" /> |