drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify ApexInfo classpath info

Browse Source 
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
This commit is contained in:
Alan Stokes 2021-12-21 17:01:11 +00:00
parent 0892c27c57
commit cd0705ed49
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/pm/StagingManager.java
View File

@ -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;
}
}

3
tests/StagedInstallTest/app/src/com/android/tests/stagedinstallinternal/StagedInstallInternalTest.java
View File

@ -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();
}