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

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

Change-Id: I6ffb22bc4b9a7a29c544b9c683881ddfe0d092e2
This commit is contained in:
Alan Stokes
2022-01-05 19:11:09 +00:00
committed by Automerger Merge Worker
parent a46d68e30e 1f0e7adc23
commit 52c0ee5c84
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

@@ -1255,9 +1255,7 @@ public class StagingManager {
info.diskImagePath = ai.modulePath; info.diskImagePath = ai.modulePath;
info.versionCode = ai.versionCode; info.versionCode = ai.versionCode;
info.versionName = ai.versionName; info.versionName = ai.versionName;
info.hasBootClassPathJars = ai.hasBootClassPathJars; info.hasClassPathJars = ai.hasClassPathJars;
info.hasDex2OatBootClassPathJars = ai.hasDex2OatBootClassPathJars;
info.hasSystemServerClassPathJars = ai.hasSystemServerClassPathJars;
return info; 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 // Query proper module name
result = getPackageManagerNative().getStagedApexInfo(TEST_APEX_PACKAGE_NAME); result = getPackageManagerNative().getStagedApexInfo(TEST_APEX_PACKAGE_NAME);
assertThat(result.moduleName).isEqualTo(TEST_APEX_PACKAGE_NAME); assertThat(result.moduleName).isEqualTo(TEST_APEX_PACKAGE_NAME);
assertThat(result.hasBootClassPathJars).isTrue(); assertThat(result.hasClassPathJars).isTrue();
assertThat(result.hasSystemServerClassPathJars).isTrue();
InstallUtils.openPackageInstallerSession(sessionId).abandon(); InstallUtils.openPackageInstallerSession(sessionId).abandon();
} }