From c001f552b4f3b34826f6d8a427074d5f1626e9a2 Mon Sep 17 00:00:00 2001
From: Sally <sallyyuen@google.com>
Date: Wed, 3 May 2023 22:48:01 +0000
Subject: [PATCH] Modify MANAGE_ACCESSIBILITY to accept roles

This is the first step in allowing Exo and the Chromebook to act
on streamed screen content on behalf of its accessibility users.

It was assumed Exo would have access to this permission, but since
it's not signed by the platform, the signature-level permission is
not automatically granted. This fix allows only pre-installed,
privileged apps that have this role, and which have asked the user
for consent to stream and communicate with apps on the mobile device.

Bug: 280661435
Test: atest AccessibilityDisplayProxyTest, PermissionPolicyTest,
CtsCompanionDeviceManagerUiAutomationTestCases, CtsRoleTestCases

Change-Id: I5c0d4d0a44344a25c41e944bdfbdfaf696da68a3
---
 core/res/AndroidManifest.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 11fcd1e248dbf..8059ee75ac6ba 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -7129,9 +7129,10 @@
                 android:protectionLevel="signature" />
 
     <!-- @SystemApi Allows modifying accessibility state.
+        <p> The only approved role for this permission is COMPANION_DEVICE_APP_STREAMING.
          @hide -->
     <permission android:name="android.permission.MANAGE_ACCESSIBILITY"
-        android:protectionLevel="signature|setup|recents" />
+        android:protectionLevel="signature|setup|recents|role" />
 
     <!-- @SystemApi Allows an app to grant a profile owner access to device identifiers.
          <p>Not for use by third-party applications.