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

Commit 3cbc22cb authored by Jakob Schneider's avatar Jakob Schneider Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE during boot if monochrome icon is missing." into main

parents 4e6e9b10 07b43a2b

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

+4 −2
Original line number Diff line number Diff line
@@ -2065,8 +2065,10 @@ public final class Settings implements Watchable, Snappable, ResilientAtomicFile 
                        ATTR_ARCHIVE_ACTIVITY_TITLE);

                Path iconPath = Path.of(parser.getAttributeValue(null,

                        ATTR_ARCHIVE_ICON_PATH));

                Path monochromeIconPath = Path.of(parser.getAttributeValue(null,

                        ATTR_ARCHIVE_MONOCHROME_ICON_PATH));

                String monochromeAttribute = parser.getAttributeValue(null,

                        ATTR_ARCHIVE_MONOCHROME_ICON_PATH);

                Path monochromeIconPath = monochromeAttribute == null ? null : Path.of(

                        monochromeAttribute);



                if (title == null || iconPath == null) {

                    Slog.wtf(TAG,