Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4a3170a4 authored by Winson's avatar Winson Committed by Todd Kennedy
Browse files

Disallow pruning system shared static libraries 

Shared libraries on the system image are assumed to always exist,
so do not prune them to free storage space.

Also fixes invalid uses of PackageSettingBase#getUserState

Bug: 128426859

Test: atest StaticSharedLibsHostTests
Test: atest EphemeralTest

Change-Id: I096749af6d7a5916ced433df60a33e2d5b8a7975
parent 055d58ae

services/core/java/com/android/server/pm/PackageManagerService.java

+7 −3
Original line number Diff line number Diff line
@@ -4688,6 +4688,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<>();















                    }










@@ -5137,7 +5142,7 @@ public class PackageManagerService extends IPackageManager.Stub













                continue;















            }



























            if (!ps.getUserState().get(userId).isAvailable(flags)) {













            if (!ps.readUserState(userId).isAvailable(flags)) {















                continue;















            }
























@@ -6968,8 +6973,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);