From cd0705ed49a7d56bd00bd6004742c688c969e3a4 Mon Sep 17 00:00:00 2001 From: Alan Stokes Date: Tue, 21 Dec 2021 17:01:11 +0000 Subject: [PATCH] Simplify ApexInfo classpath info Stop differentiating between the different ways an APEX can contribute to derive_classpath - it makes no difference for the use cases, and it doesn't scale if new environment variables are added. Bug: 210472252 Test: atest ComposTestCase Change-Id: I9256a6b5cc3689a8d61d51e8eb8d8c3f475172aa --- services/core/java/com/android/server/pm/StagingManager.java | 4 +--- .../stagedinstallinternal/StagedInstallInternalTest.java | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/services/core/java/com/android/server/pm/StagingManager.java b/services/core/java/com/android/server/pm/StagingManager.java index 08a72151aa37..97c168d4fb0b 100644 --- a/services/core/java/com/android/server/pm/StagingManager.java +++ b/services/core/java/com/android/server/pm/StagingManager.java @@ -1255,9 +1255,7 @@ public class StagingManager { info.diskImagePath = ai.modulePath; info.versionCode = ai.versionCode; info.versionName = ai.versionName; - info.hasBootClassPathJars = ai.hasBootClassPathJars; - info.hasDex2OatBootClassPathJars = ai.hasDex2OatBootClassPathJars; - info.hasSystemServerClassPathJars = ai.hasSystemServerClassPathJars; + info.hasClassPathJars = ai.hasClassPathJars; return info; } } diff --git a/tests/StagedInstallTest/app/src/com/android/tests/stagedinstallinternal/StagedInstallInternalTest.java b/tests/StagedInstallTest/app/src/com/android/tests/stagedinstallinternal/StagedInstallInternalTest.java index f0ab63eb41b5..06200cd99b5b 100644 --- a/tests/StagedInstallTest/app/src/com/android/tests/stagedinstallinternal/StagedInstallInternalTest.java +++ b/tests/StagedInstallTest/app/src/com/android/tests/stagedinstallinternal/StagedInstallInternalTest.java @@ -449,8 +449,7 @@ public class StagedInstallInternalTest { // Query proper module name result = getPackageManagerNative().getStagedApexInfo(TEST_APEX_PACKAGE_NAME); assertThat(result.moduleName).isEqualTo(TEST_APEX_PACKAGE_NAME); - assertThat(result.hasBootClassPathJars).isTrue(); - assertThat(result.hasSystemServerClassPathJars).isTrue(); + assertThat(result.hasClassPathJars).isTrue(); InstallUtils.openPackageInstallerSession(sessionId).abandon(); }