From b28b7960b2bd2d33cbccd88d2d4d3c05e09f2770 Mon Sep 17 00:00:00 2001 From: Steven Moreland Date: Wed, 6 Mar 2019 09:20:37 -0800 Subject: [PATCH] pm: PackageBackwardCompatibility -> applyPolicy This moves PackageBackwardCompatibility from parsePackage to applyPolicy. The motivation of this is to expose partition information to these files. Specifically, to expose whether the app is a pre-installed (or updated pre-installed app) for certain backwards compatibility rules that should only apply to these cases. Bug: 86259915 Test: boot Pixel 2 Test: Pixel 3: atest -p cts/tests/signature - all passed except for CtsSystemApiAnnotationTestCases test which failed (known issue b/124210145) Change-Id: Ic824f06489781233dc98bf3dc0182681d32f7142 --- core/java/android/content/pm/PackageParser.java | 2 -- .../core/java/com/android/server/pm/PackageManagerService.java | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java index ecb9dbf386141..d710d57d8f0be 100644 --- a/core/java/android/content/pm/PackageParser.java +++ b/core/java/android/content/pm/PackageParser.java @@ -3857,8 +3857,6 @@ public class PackageParser { // every activity info has had a chance to set it from its attributes. setMaxAspectRatio(owner); - PackageBackwardCompatibility.modifySharedLibraries(owner); - if (hasDomainURLs(owner)) { owner.applicationInfo.privateFlags |= ApplicationInfo.PRIVATE_FLAG_HAS_DOMAIN_URLS; } else { diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index a98e2d3fd0dad..2f510a7141b53 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -168,6 +168,7 @@ import android.content.pm.InstantAppRequest; import android.content.pm.InstantAppResolveInfo; import android.content.pm.InstrumentationInfo; import android.content.pm.IntentFilterVerificationInfo; +import android.content.pm.PackageBackwardCompatibility; import android.content.pm.KeySet; import android.content.pm.PackageCleanItem; import android.content.pm.PackageInfo; @@ -11043,6 +11044,8 @@ public class PackageManagerService extends IPackageManager.Stub pkg.mRealPackage = null; pkg.mAdoptPermissions = null; } + + PackageBackwardCompatibility.modifySharedLibraries(pkg); } private static @NonNull T assertNotNull(@Nullable T object, String message)