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

Commit a7677436 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 

am: 06e7c43a

Change-Id: Ie723fbbc6437158e554480709c980c0541fec3fb
parents 3a808cda 06e7c43a

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);

        }