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

Commit 99129e20 authored by Song Chun Fan's avatar Song Chun Fan Committed by Android (Google) Code Review
Browse files

Merge "Add null pointer check for component name" into main

parents 19d146b4 be6807e8

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

+8 −1
Original line number Diff line number Diff line
@@ -2139,10 +2139,17 @@ public final class Settings implements Watchable, Snappable, ResilientAtomicFile 
                    continue;

                }



                ComponentName unflattenOriginalComponentName = ComponentName.unflattenFromString(

                        originalComponentName);

                if (unflattenOriginalComponentName == null) {

                    Slog.d(TAG, "Incorrect component name from the attributes");

                    continue;

                }



                activityInfos.add(

                        new ArchiveState.ArchiveActivityInfo(

                                title,

                                ComponentName.unflattenFromString(originalComponentName),

                                unflattenOriginalComponentName,

                                iconPath,

                                monochromeIconPath));

            }