From 370fae65d8101fcf27b516d06d8aa403f73125c1 Mon Sep 17 00:00:00 2001
From: Nikita Dubrovsky <dubrovsky@google.com>
Date: Wed, 9 Mar 2022 13:20:29 -0800
Subject: [PATCH] Update READ_CLIPBOARD_IN_BACKGROUND to be grantable via roles

ClipboardService currently has a special case to allow Android System
Intelligence to read the clipboard in the background. The special case
is implemented by checking if the calling package is the provider of
ContentCaptureService. Rather than having to maintain this special case,
we want to reuse the existing READ_CLIPBOARD_IN_BACKGROUND permission
by allowing it to be associated with roles. This way the permission will
be associated with the appropriate role held by Android System
Intelligence and the special case can be removed from ClipboardService.
This also decouples which PCC package provides ContentCaptureService vs
which PCC package should be allowed to access the clipboard.

The change to remove the special case logic from ClipboardService will
be done as a separate CL.

Bug: 216314180
Test: atest PermissionPolicyTest
Change-Id: I68abf8c200f6827fc350ab2f990eb78d9d850c8b
---
 core/api/system-current.txt  | 1 +
 core/res/AndroidManifest.xml | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/core/api/system-current.txt b/core/api/system-current.txt
index 15666017f4319..078779b6afd03 100644
--- a/core/api/system-current.txt
+++ b/core/api/system-current.txt
@@ -242,6 +242,7 @@ package android {
     field public static final String READ_APP_SPECIFIC_LOCALES = "android.permission.READ_APP_SPECIFIC_LOCALES";
     field public static final String READ_CARRIER_APP_INFO = "android.permission.READ_CARRIER_APP_INFO";
     field public static final String READ_CELL_BROADCASTS = "android.permission.READ_CELL_BROADCASTS";
+    field public static final String READ_CLIPBOARD_IN_BACKGROUND = "android.permission.READ_CLIPBOARD_IN_BACKGROUND";
     field public static final String READ_CONTENT_RATING_SYSTEMS = "android.permission.READ_CONTENT_RATING_SYSTEMS";
     field public static final String READ_DEVICE_CONFIG = "android.permission.READ_DEVICE_CONFIG";
     field public static final String READ_DREAM_STATE = "android.permission.READ_DREAM_STATE";
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 434222ae80162..5a6306ecf8c23 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -6026,10 +6026,10 @@
     <permission android:name="android.permission.MANAGE_APPOPS"
                 android:protectionLevel="signature" />
 
-    <!-- @hide Permission that allows background clipboard access.
-         <p>Not for use by third-party applications. -->
+    <!-- @SystemApi Permission that allows background clipboard access.
+         @hide Not for use by third-party applications. -->
     <permission android:name="android.permission.READ_CLIPBOARD_IN_BACKGROUND"
-        android:protectionLevel="signature" />
+        android:protectionLevel="internal|role" />
     <!-- @hide Permission that suppresses the notification when the clipboard is accessed.
          <p>Not for use by third-party applications. -->
     <permission android:name="android.permission.SUPPRESS_CLIPBOARD_ACCESS_NOTIFICATION"