From 3d023c38cb14fb31b049dcb85084674c1ed6faab Mon Sep 17 00:00:00 2001
From: Alex Buynytskyy <alexbuy@google.com>
Date: Tue, 9 May 2023 12:12:41 -0700
Subject: [PATCH] Make the test suite device-tests.

+grant all permissions

Fixes: 272575212
Test: atest PackageManagerServiceHostTests
Change-Id: I0087c1bcd360f61a05a43855971f637f439ec808
---
 services/tests/PackageManagerServiceTests/host/Android.bp      | 2 +-
 services/tests/PackageManagerServiceTests/host/AndroidTest.xml | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/services/tests/PackageManagerServiceTests/host/Android.bp b/services/tests/PackageManagerServiceTests/host/Android.bp
index d9467a5e1712b..c7a71eeb969ca 100644
--- a/services/tests/PackageManagerServiceTests/host/Android.bp
+++ b/services/tests/PackageManagerServiceTests/host/Android.bp
@@ -39,7 +39,7 @@ java_test_host {
         "PackageManagerServiceHostTestsIntentVerifyUtils",
         "block_device_writer_jar",
     ],
-    test_suites: ["general-tests"],
+    test_suites: ["device-tests"],
     data: [
         ":PackageManagerTestApex",
         ":PackageManagerTestApexApp",
diff --git a/services/tests/PackageManagerServiceTests/host/AndroidTest.xml b/services/tests/PackageManagerServiceTests/host/AndroidTest.xml
index 2382548192ad3..f594f6f06ed25 100644
--- a/services/tests/PackageManagerServiceTests/host/AndroidTest.xml
+++ b/services/tests/PackageManagerServiceTests/host/AndroidTest.xml
@@ -30,6 +30,7 @@
     <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="install-arg" value="-t" />
+        <option name="install-arg" value="-g" />
         <option name="test-file-name" value="PackageManagerServiceServerTests.apk" />
     </target_preparer>