diff options
| -rw-r--r-- | services/core/java/com/android/server/pm/PackageManagerService.java | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index e62714e7b5fe..78aa5a0b66d7 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -4700,6 +4700,11 @@ public class PackageManagerService extends IPackageManager.Stub if (ps == null || now - ps.lastUpdateTime < maxCachePeriod) { continue; } + + if (ps.pkg.isSystem()) { + continue; + } + if (packagesToDelete == null) { packagesToDelete = new ArrayList<>(); } @@ -5149,7 +5154,7 @@ public class PackageManagerService extends IPackageManager.Stub continue; } - if (!ps.getUserState().get(userId).isAvailable(flags)) { + if (!ps.readUserState(userId).isAvailable(flags)) { continue; } @@ -6980,8 +6985,7 @@ public class PackageManagerService extends IPackageManager.Stub } final PackageSetting ps = mSettings.mPackages.get(mInstantAppInstallerActivity.packageName); if (ps == null - || ps.getUserState().get(userId) == null - || !ps.getUserState().get(userId).isEnabled(mInstantAppInstallerActivity, 0)) { + || !ps.readUserState(userId).isEnabled(mInstantAppInstallerActivity, 0)) { return result; } final ResolveInfo ephemeralInstaller = new ResolveInfo(mInstantAppInstallerInfo); |