From dd6029b7e611060f1befd98e57c3ce59333fb25e Mon Sep 17 00:00:00 2001
From: Songchun Fan <schfan@google.com>
Date: Thu, 25 Aug 2022 10:34:36 -0700
Subject: [PATCH] [test] fix SystemUITests

Non-data apps that have a sharedUserId shared with a privileged app and
use privileged permissions need to testOnly.

BUG: 236173905
Fixes: 243736722
BUG: 243736722
Test: atest SystemUITests
Change-Id: I466b4c305fc0882e036298840c04601747882b18
---
 packages/SystemUI/tests/AndroidManifest.xml | 2 +-
 packages/SystemUI/tests/AndroidTest.xml     | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/SystemUI/tests/AndroidManifest.xml b/packages/SystemUI/tests/AndroidManifest.xml
index ba2804572ef5c..0fa3d366df8ae 100644
--- a/packages/SystemUI/tests/AndroidManifest.xml
+++ b/packages/SystemUI/tests/AndroidManifest.xml
@@ -53,7 +53,7 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.REGISTER_WINDOW_MANAGER_LISTENERS" />
 
-    <application android:debuggable="true" android:largeHeap="true"
+    <application android:debuggable="true" android:largeHeap="true" android:testOnly="true"
             android:enableOnBackInvokedCallback="true" >
         <uses-library android:name="android.test.runner" />
 
diff --git a/packages/SystemUI/tests/AndroidTest.xml b/packages/SystemUI/tests/AndroidTest.xml
index 5ffd3008c6cd3..31e7bd2614d6e 100644
--- a/packages/SystemUI/tests/AndroidTest.xml
+++ b/packages/SystemUI/tests/AndroidTest.xml
@@ -16,6 +16,7 @@
 <configuration description="Runs Tests for SystemUI.">
     <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">
         <option name="test-file-name" value="SystemUITests.apk" />
+        <option name="install-arg" value="-t" />
     </target_preparer>
 
     <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer">