From 817d4a78ebd0d1e5050666016c3ddbff5e1465f3 Mon Sep 17 00:00:00 2001
From: Peiyong Lin <lpy@google.com>
Date: Fri, 4 Feb 2022 08:00:27 +0000
Subject: [PATCH] Allow Shell to access MANAGE_GAME_ACTIVITY.

Allow Shell to have MANAGE_GAME_ACTIVITY permission in order to run CTS.

Bug: b/202414447
Test: atest GameServiceTest
Ignore-AOSP-First: not-yet-published new permission.
Change-Id: I11a64d4e2819e5a94ae59d280eaa165dce51f518
---
 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 a331b6eb67503..3badfe4ae15b0 100644
--- a/data/etc/privapp-permissions-platform.xml
+++ b/data/etc/privapp-permissions-platform.xml
@@ -334,6 +334,7 @@ applications that come with the platform
         <permission name="android.permission.MANAGE_ACCESSIBILITY"/>
         <permission name="android.permission.MANAGE_DEVICE_ADMINS"/>
         <permission name="android.permission.MANAGE_GAME_MODE"/>
+        <permission name="android.permission.MANAGE_GAME_ACTIVITY" />
         <permission name="android.permission.MANAGE_LOW_POWER_STANDBY" />
         <permission name="android.permission.MANAGE_ROLLBACKS"/>
         <permission name="android.permission.MANAGE_USB"/>
diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml
index 6f4cd4a0f6ee7..35eeac822d3c3 100644
--- a/packages/Shell/AndroidManifest.xml
+++ b/packages/Shell/AndroidManifest.xml
@@ -568,6 +568,7 @@
 
     <!-- Permission required for CTS test - CtsGameServiceTestCases -->
     <uses-permission android:name="android.permission.SET_GAME_SERVICE" />
+    <uses-permission android:name="android.permission.MANAGE_GAME_ACTIVITY" />
 
     <!-- Permission required for CTS test - ClipboardManagerTest -->
     <uses-permission android:name="android.permission.SET_CLIP_SOURCE" />