From 1f8d70589b15698795da444e24ee4f9ae850ba2e Mon Sep 17 00:00:00 2001
From: Jared Duke <jdduke@google.com>
Date: Tue, 15 Mar 2022 21:46:23 +0000
Subject: [PATCH] Revert "Update READ_CLIPBOARD_IN_BACKGROUND to be grantable
 via ..."

Revert "Add READ_CLIPBOARD_IN_BACKGROUND to the SYSTEM_TEXT_INTE..."

Revert "Update CTS for the READ_CLIPBOARD_IN_BACKGROUND permission"

Revert submission 17145144-cc-clipboard-permission

Reason for revert: Breaks UnbundledChooserActivityTest#copyTextToClipboard
Reverted Changes:
I6f3fbe3fe:Update CTS for the READ_CLIPBOARD_IN_BACKGROUND pe...
Icba3763e6:Add READ_CLIPBOARD_IN_BACKGROUND to the SYSTEM_TEX...
I68abf8c20:Update READ_CLIPBOARD_IN_BACKGROUND to be grantabl...

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

diff --git a/core/api/system-current.txt b/core/api/system-current.txt
index 078779b6afd03..15666017f4319 100644
--- a/core/api/system-current.txt
+++ b/core/api/system-current.txt
@@ -242,7 +242,6 @@ 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 5a6306ecf8c23..434222ae80162 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" />
 
-    <!-- @SystemApi Permission that allows background clipboard access.
-         @hide Not for use by third-party applications. -->
+    <!-- @hide Permission that allows background clipboard access.
+         <p>Not for use by third-party applications. -->
     <permission android:name="android.permission.READ_CLIPBOARD_IN_BACKGROUND"
-        android:protectionLevel="internal|role" />
+        android:protectionLevel="signature" />
     <!-- @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"