diff options
| -rw-r--r-- | services/core/java/com/android/server/pm/InstallRequest.java | 6 | ||||
| -rw-r--r-- | services/core/java/com/android/server/pm/SharedLibrariesImpl.java | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/pm/InstallRequest.java b/services/core/java/com/android/server/pm/InstallRequest.java index 0a81b2b9fabb..5494bd9808c8 100644 --- a/services/core/java/com/android/server/pm/InstallRequest.java +++ b/services/core/java/com/android/server/pm/InstallRequest.java @@ -539,6 +539,12 @@ final class InstallRequest { } @Nullable + public PackageSetting getScanRequestDisabledPackageSetting() { + assertScanResultExists(); + return mScanResult.mRequest.mDisabledPkgSetting; + } + + @Nullable public String getRealPackageName() { assertScanResultExists(); return mScanResult.mRequest.mRealPkgName; diff --git a/services/core/java/com/android/server/pm/SharedLibrariesImpl.java b/services/core/java/com/android/server/pm/SharedLibrariesImpl.java index d0fdfa9bc775..9384c13e583b 100644 --- a/services/core/java/com/android/server/pm/SharedLibrariesImpl.java +++ b/services/core/java/com/android/server/pm/SharedLibrariesImpl.java @@ -856,9 +856,9 @@ public final class SharedLibrariesImpl implements SharedLibrariesRead, Watchable // We may not yet have disabled the updated package yet, so be sure to grab the // current setting if that's the case. final PackageSetting updatedSystemPs = isUpdatedSystemApp - ? installRequest.getDisabledPackageSetting() == null + ? installRequest.getScanRequestDisabledPackageSetting() == null ? installRequest.getScanRequestOldPackageSetting() - : installRequest.getDisabledPackageSetting() + : installRequest.getScanRequestDisabledPackageSetting() : null; if (isUpdatedSystemApp && (updatedSystemPs.getPkg() == null || updatedSystemPs.getPkg().getLibraryNames() == null)) { |