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

Commit dc4d184e authored by android-build-team Robot's avatar android-build-team Robot Committed by android-build-merger
Browse files

Merge "Fix an NPE in PackageManagerService (introduced by ag/3819668)" into pi-dev 

am: e4d1cabe

Change-Id: I8281c6aa2f84f6b0401e1c14cc0d027312101db4
parents cd2d6d90 e4d1cabe

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

+5 −1
Original line number Diff line number Diff line
@@ -22473,9 +22473,13 @@ Slog.v(TAG, ":: stepped forward, applying functor at tag " + parser.getName()); 
        }

        final String volumeUuid = pkg.volumeUuid;

        final String packageName = pkg.packageName;

        final ApplicationInfo app = (ps == null)













        ApplicationInfo app = (ps == null)















                ? pkg.applicationInfo















                : PackageParser.generateApplicationInfo(pkg, 0, ps.readUserState(userId), userId);













        if (app == null) {













            app = pkg.applicationInfo;













        }





























        final int appId = UserHandle.getAppId(app.uid);