From 8bddf5091e0bf4e8252abc66169a7bcc9459001a Mon Sep 17 00:00:00 2001
From: Robin Lee <rgl@google.com>
Date: Thu, 13 Jul 2023 12:47:44 +0000
Subject: Allow shell to control transition animations

Test: atest 'CtsSecurityTestCases:android.security.cts.ActivityManagerTest#testActivityManager_stripTransitionFromActivityOptions'
Bug: 286882367
Bug: 290586831
Bug: 237290578
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:0be0367ece4d946de576f7bb1e6e6777633a736d)
Merged-In: Iffe5625ae57c21874805ef98b67faac9f56f87f5
Change-Id: Iffe5625ae57c21874805ef98b67faac9f56f87f5
---
 data/etc/privapp-permissions-platform.xml | 1 +
 packages/Shell/AndroidManifest.xml        | 1 +
 2 files changed, 2 insertions(+)

diff --git a/data/etc/privapp-permissions-platform.xml b/data/etc/privapp-permissions-platform.xml
index a044602f7ec0..b05507e7e128 100644
--- a/data/etc/privapp-permissions-platform.xml
+++ b/data/etc/privapp-permissions-platform.xml
@@ -257,6 +257,7 @@ applications that come with the platform
         <permission name="android.permission.CLEAR_APP_CACHE"/>
         <permission name="android.permission.ACCESS_INSTANT_APPS" />
         <permission name="android.permission.CONNECTIVITY_INTERNAL"/>
+        <permission name="android.permission.CONTROL_REMOTE_APP_TRANSITION_ANIMATIONS" />
         <permission name="android.permission.DELETE_CACHE_FILES"/>
         <permission name="android.permission.DELETE_PACKAGES"/>
         <permission name="android.permission.DUMP"/>
diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml
index 56e0643b1e20..ee9883b0b0af 100644
--- a/packages/Shell/AndroidManifest.xml
+++ b/packages/Shell/AndroidManifest.xml
@@ -320,6 +320,7 @@
 
 
     <uses-permission android:name="android.permission.CONTROL_KEYGUARD" />
+    <uses-permission android:name="android.permission.CONTROL_REMOTE_APP_TRANSITION_ANIMATIONS" />
     <uses-permission android:name="android.permission.SUSPEND_APPS" />
     <uses-permission android:name="android.permission.OBSERVE_APP_USAGE" />
     <uses-permission android:name="android.permission.READ_CLIPBOARD_IN_BACKGROUND" />
-- 
cgit v1.2.3-59-g8ed1b