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

Commit be6807e8 authored by lpeter's avatar lpeter
Browse files

Add null pointer check for component name 

Bug: 339651741
Test: presubmit
Change-Id: I70fb8c3521cc21ab0f061aec90e0bf11dcf36550
parent 4ff9eb1e

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

            }