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

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

Merge "Add null check before checking overlay" into pi-dev 

am: 5d1d771e

Change-Id: I9ab7d738a4a32d1dcba566b0ce9cea0b149dfaef
parents e914fcca 5d1d771e

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

+1 −1
Original line number Diff line number Diff line
@@ -4706,7 +4706,7 @@ public final class Settings { 
        pw.print(prefix); pw.print("  pkgFlags="); printFlags(pw, ps.pkgFlags, FLAG_DUMP_SPEC);

                pw.println();



        if (ps.pkg.mOverlayTarget != null) {

        if (ps.pkg != null && ps.pkg.mOverlayTarget != null) {

            pw.print(prefix); pw.print("  overlayTarget="); pw.println(ps.pkg.mOverlayTarget);

            pw.print(prefix); pw.print("  overlayCategory="); pw.println(ps.pkg.mOverlayCategory);

        }