From d8c3b65041fdfae0e19e7c87998150ab8ce12139 Mon Sep 17 00:00:00 2001
From: Gareth Vaughan <garethv@google.com>
Date: Fri, 10 Dec 2021 12:49:35 -0500
Subject: [PATCH] Add new permission START_CROSS_PROFILE_ACTIVITIES

This allows holders of START_CROSS_PROFILE_ACTIVITIES permission to start an activity of the caller package in the other profile.
The "android.app.role.SYSTEM_WELLBEING" role will get this permission.

Test: atest CrossProfileAppsHostSideTest
Bug: 207117478
Change-Id: I9f554e937a653a51d5bbdaf19a7a90a9073d1aca
Merged-In: I4f368ec1a5facc0a95efee06b56522db853ff6d8
---
 core/api/system-current.txt        | 1 +
 core/res/AndroidManifest.xml       | 4 ++++
 packages/Shell/AndroidManifest.xml | 3 +++
 3 files changed, 8 insertions(+)

diff --git a/core/api/system-current.txt b/core/api/system-current.txt
index 29957e450e246..ced65d7388a35 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 c11502f616034..6bcaace96cbec 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 618a37e2e40fe..5b9b74a96e1c1 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" />