From 2800f9c8f2ebeb839a2d5cb165cd8b001535cf94 Mon Sep 17 00:00:00 2001
From: Dave McCloskey <dlm@google.com>
Date: Thu, 5 Jan 2023 00:08:21 +0000
Subject: [PATCH] Revert "Add permissions to the shell to allow creation of CTS
 tests for trust." and "Add TRUST_LISTENER to the shell for use in CTS tests"

This reverts commits 48ae5a779061830466eee6b2cf2d02e0d4070ed7 and e0b7e861cd5c8e838ba9f203ecf7a5c85c5688e0.

Reason for revert: These tests were never created.

Change-Id: I485cfa599818d897f0eb22e4bb754ad411e6f07c
Bug: 262927539
---
 data/etc/privapp-permissions-platform.xml | 4 ----
 packages/Shell/AndroidManifest.xml        | 5 -----
 2 files changed, 9 deletions(-)

diff --git a/data/etc/privapp-permissions-platform.xml b/data/etc/privapp-permissions-platform.xml
index 8ca16071a1e46..ff42fb52d8e73 100644
--- a/data/etc/privapp-permissions-platform.xml
+++ b/data/etc/privapp-permissions-platform.xml
@@ -342,10 +342,6 @@ applications that come with the platform
         <permission name="android.permission.SET_WALLPAPER_COMPONENT" />
         <permission name="android.permission.SET_WALLPAPER_DIM_AMOUNT" />
         <permission name="android.permission.REQUEST_NOTIFICATION_ASSISTANT_SERVICE" />
-        <!-- Permission required for CTS test - TrustTestCases -->
-        <permission name="android.permission.PROVIDE_TRUST_AGENT" />
-        <permission name="android.permission.ACCESS_KEYGUARD_SECURE_STORAGE" />
-        <permission name="android.permission.TRUST_LISTENER" />
         <!-- Permissions required for Incremental CTS tests -->
         <permission name="com.android.permission.USE_INSTALLER_V2"/>
         <permission name="android.permission.LOADER_USAGE_STATS"/>
diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml
index 979e9eaa1e844..f13d961a46477 100644
--- a/packages/Shell/AndroidManifest.xml
+++ b/packages/Shell/AndroidManifest.xml
@@ -578,11 +578,6 @@
     <!-- Permission required for CTS test - PeopleManagerTest -->
     <uses-permission android:name="android.permission.READ_PEOPLE_DATA" />
 
-    <!-- Permissions required for CTS test - TrustTestCases -->
-    <uses-permission android:name="android.permission.PROVIDE_TRUST_AGENT" />
-    <uses-permission android:name="android.permission.ACCESS_KEYGUARD_SECURE_STORAGE" />
-    <uses-permission android:name="android.permission.TRUST_LISTENER" />
-
     <!-- Permission required for CTS test - CtsTaskFpsCallbackTestCases -->
     <uses-permission android:name="android.permission.ACCESS_FPS_COUNTER" />