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

Commit 22040a53 authored by Todd Kennedy's avatar Todd Kennedy Committed by Android (Google) Code Review
Browse files

Merge "null check"

parents a2feb80b 540dcb22

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

+2 −2
Original line number Diff line number Diff line
@@ -3449,7 +3449,7 @@ public class PackageManagerService extends IPackageManager.Stub { 
    }



























    private boolean filterSharedLibPackageLPr(PackageSetting ps, int uid, int userId) {













    private boolean filterSharedLibPackageLPr(@Nullable PackageSetting ps, int uid, int userId) {















        // System/shell/root get to see all static libs















        final int appId = UserHandle.getAppId(uid);















        if (appId == Process.SYSTEM_UID || appId == Process.SHELL_UID









@@ -3458,7 +3458,7 @@ public class PackageManagerService extends IPackageManager.Stub {













        }





























        // No package means no static lib as it is always on internal storage













        if (ps.pkg == null || !ps.pkg.applicationInfo.isStaticSharedLibrary()) {













        if (ps == null || ps.pkg == null || !ps.pkg.applicationInfo.isStaticSharedLibrary()) {















            return false;















        }