Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Simplify ApexInfo classpath info" am: 3281d1b876 am: 045526da15 am: 1f0e7adc23 am: 52c0ee5c84

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1931078

Change-Id: I1ca8de06eb62b6aa17a96fc5f8b5f93fae302b5b
This commit is contained in:
Alan Stokes
2022-01-05 19:42:35 +00:00
committed by Automerger Merge Worker
parent e73c58ed5a 52c0ee5c84
commit 8975ee31ba
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -932,9 +932,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

@@ -479,8 +479,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();
}