commit 019cdea92acef02d4f34d655fdec4570cc03b7f5
author Kenn Frankel <kfrankel@google.com> Tue Apr 23 15:58:45 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Apr 23 15:58:45 2024 +0000
tree 3eaf4f327da4b298b2b2af57f1dca163925e498e
parent e81e95b6758f83e43cb6ca6edff958ff606d37dc
parent 8a8158b0723133b9931cc051b257f8c19afd9871

Merge "Apexd logs metrics atoms for rebootless installs" into main

tests/app/src/com/android/tests/apex/app/VendorApexTests.java

diff --git a/tests/app/src/com/android/tests/apex/app/VendorApexTests.java b/tests/app/src/com/android/tests/apex/app/VendorApexTests.java
index 5e8519a..1739bad 100644
--- a/tests/app/src/com/android/tests/apex/app/VendorApexTests.java
+++ b/tests/app/src/com/android/tests/apex/app/VendorApexTests.java
@@ -32,6 +32,7 @@
 import com.android.cts.install.lib.InstallUtils;
 import com.android.cts.install.lib.TestApp;
 
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -63,11 +64,16 @@
             "com.android.apex.vendor.foo.v2_with_wrong_vndk_version", APEX_PACKAGE_NAME, 2,
             /*isApex*/true, "com.android.apex.vendor.foo.v2_with_wrong_vndk_version.apex");
 
+    @Before
+    public void setUp() {
+        InstallUtils.dropShellPermissionIdentity();
+        InstallUtils.adoptShellPermissionIdentity(
+                Manifest.permission.INSTALL_PACKAGE_UPDATES,
+                Manifest.permission.INSTALL_TEST_ONLY_PACKAGE);
+    }
+
     @Test
     public void testRebootlessUpdate() throws Exception {
-        InstallUtils.dropShellPermissionIdentity();
-        InstallUtils.adoptShellPermissionIdentity(Manifest.permission.INSTALL_PACKAGE_UPDATES);
-
         final PackageManager pm =
                 InstrumentationRegistry.getInstrumentation().getContext().getPackageManager();
         {
@@ -87,9 +93,6 @@
 
     @Test
     public void testGenerateLinkerConfigurationOnUpdate() throws Exception {
-        InstallUtils.dropShellPermissionIdentity();
-        InstallUtils.adoptShellPermissionIdentity(Manifest.permission.INSTALL_PACKAGE_UPDATES);
-
         // There's no ld.config.txt for v1 (preinstalled, empty)
         final Path ldConfigTxt = Paths.get("/linkerconfig", APEX_PACKAGE_NAME, "ld.config.txt");
         assertTrue(Files.notExists(ldConfigTxt));
@@ -114,9 +117,6 @@
 
     @Test
     public void testRestartServiceAfterRebootlessUpdate() throws Exception {
-        InstallUtils.dropShellPermissionIdentity();
-        InstallUtils.adoptShellPermissionIdentity(Manifest.permission.INSTALL_PACKAGE_UPDATES);
-
         assertThat(SystemProperties.get("init.svc.apex_vendor_foo_v1", ""))
             .isEqualTo("running");
         assertThat(SystemProperties.get("init.svc.apex_vendor_foo_v2", ""))
@@ -136,9 +136,6 @@
 
     @Test
     public void testInstallAbortsWhenVndkVersionMismatches() throws Exception {
-        InstallUtils.dropShellPermissionIdentity();
-        InstallUtils.adoptShellPermissionIdentity(Manifest.permission.INSTALL_PACKAGE_UPDATES);
-
         InstallUtils.commitExpectingFailure(
                 AssertionError.class,
                 "vndkVersion\\(WrongVndkVersion\\) doesn't match with device VNDK version",
@@ -147,9 +144,6 @@
 
     @Test
     public void testInstallAbortsWhenVndkVersionMismatches_Staged() throws Exception {
-        InstallUtils.dropShellPermissionIdentity();
-        InstallUtils.adoptShellPermissionIdentity(Manifest.permission.INSTALL_PACKAGE_UPDATES);
-
         InstallUtils.commitExpectingFailure(
                 AssertionError.class,
                 "vndkVersion\\(WrongVndkVersion\\) doesn't match with device VNDK version",