diff options
4 files changed, 9 insertions, 9 deletions
diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java index cf858f585c85..a74c34ff4a88 100644 --- a/core/java/android/content/pm/PackageParser.java +++ b/core/java/android/content/pm/PackageParser.java @@ -8391,7 +8391,7 @@ public class PackageParser { public static PackageInfo generatePackageInfoFromApex(ApexInfo apexInfo, int flags) throws PackageParserException { PackageParser pp = new PackageParser(); - File apexFile = new File(apexInfo.packagePath); + File apexFile = new File(apexInfo.modulePath); final Package p = pp.parsePackage(apexFile, flags, false); PackageUserState state = new PackageUserState(); PackageInfo pi = generatePackageInfo(p, EmptyArray.INT, flags, 0, 0, diff --git a/core/tests/coretests/src/android/content/pm/PackageParserTest.java b/core/tests/coretests/src/android/content/pm/PackageParserTest.java index 71d9a46eaa24..58c43ac2cf91 100644 --- a/core/tests/coretests/src/android/content/pm/PackageParserTest.java +++ b/core/tests/coretests/src/android/content/pm/PackageParserTest.java @@ -498,14 +498,14 @@ public class PackageParserTest { @Test public void testApexPackageInfoGeneration() throws Exception { - String apexPackageName = "com.android.tzdata.apex"; - File apexFile = copyRawResourceToFile(apexPackageName, + String apexModuleName = "com.android.tzdata.apex"; + File apexFile = copyRawResourceToFile(apexModuleName, R.raw.com_android_tzdata); ApexInfo apexInfo = new ApexInfo(); apexInfo.isActive = true; apexInfo.isFactory = false; - apexInfo.packageName = apexPackageName; - apexInfo.packagePath = apexFile.getPath(); + apexInfo.moduleName = apexModuleName; + apexInfo.modulePath = apexFile.getPath(); apexInfo.versionCode = 191000070; int flags = PackageManager.GET_META_DATA | PackageManager.GET_SIGNING_CERTIFICATES; PackageInfo pi = PackageParser.generatePackageInfoFromApex(apexInfo, flags); diff --git a/services/core/java/com/android/server/pm/ApexManager.java b/services/core/java/com/android/server/pm/ApexManager.java index 3a74798a2ad8..03224d1939b9 100644 --- a/services/core/java/com/android/server/pm/ApexManager.java +++ b/services/core/java/com/android/server/pm/ApexManager.java @@ -117,7 +117,7 @@ class ApexManager { for (ApexInfo ai : allPkgs) { // If the device is using flattened APEX, don't report any APEX // packages since they won't be managed or updated by PackageManager. - if ((new File(ai.packagePath)).isDirectory()) { + if ((new File(ai.modulePath)).isDirectory()) { break; } try { @@ -131,7 +131,7 @@ class ApexManager { "Two active packages have the same name: " + pkg.packageName); } - activePackagesSet.add(ai.packageName); + activePackagesSet.add(pkg.packageName); } if (ai.isFactory) { if (factoryPackagesSet.contains(pkg.packageName)) { @@ -139,7 +139,7 @@ class ApexManager { "Two factory packages have the same name: " + pkg.packageName); } - factoryPackagesSet.add(ai.packageName); + factoryPackagesSet.add(pkg.packageName); } } catch (PackageParserException pe) { throw new IllegalStateException("Unable to parse: " + ai, pe); diff --git a/services/core/java/com/android/server/pm/StagingManager.java b/services/core/java/com/android/server/pm/StagingManager.java index 18bbfed3364f..f9a019703f4d 100644 --- a/services/core/java/com/android/server/pm/StagingManager.java +++ b/services/core/java/com/android/server/pm/StagingManager.java @@ -170,7 +170,7 @@ public class StagingManager { PackageManager.GET_META_DATA); } catch (PackageParserException e) { throw new PackageManagerException(SessionInfo.STAGED_SESSION_VERIFICATION_FAILED, - "Failed to parse APEX package " + newPackage.packagePath, e); + "Failed to parse APEX package " + newPackage.modulePath, e); } final PackageInfo activePackage = mApexManager.getPackageInfo(pkg.packageName, ApexManager.MATCH_ACTIVE_PACKAGE); |