From 2164771130ad7b9cb7ebbd2c68fcdc25cdfda0f3 Mon Sep 17 00:00:00 2001
From: Sebastian Franco <fransebas@google.com>
Date: Wed, 5 Feb 2025 13:13:36 -0800
Subject: [PATCH] Fix null ptr exception on createUpdateRunnable lambda

Fix: 394043832
Test: NA
Flag: EXEMPT bugfix
Change-Id: I60b85c520e7553318ea741da8768951c974dcc7e
---
 src/com/android/launcher3/popup/PopupPopulator.java | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/com/android/launcher3/popup/PopupPopulator.java b/src/com/android/launcher3/popup/PopupPopulator.java
index b7480116f9..bc5064d87a 100644
--- a/src/com/android/launcher3/popup/PopupPopulator.java
+++ b/src/com/android/launcher3/popup/PopupPopulator.java
@@ -110,13 +110,16 @@ public class PopupPopulator {
     public static <T extends Context & ActivityContext> Runnable createUpdateRunnable(
             final T context,
             final ItemInfo originalInfo,
-            final Handler uiHandler, final PopupContainerWithArrow container,
-            final List<DeepShortcutView> shortcutViews) {
+            final Handler uiHandler,
+            final PopupContainerWithArrow container,
+            final List<DeepShortcutView> shortcutViews
+    ) {
         final ComponentName activity = originalInfo.getTargetComponent();
         final UserHandle user = originalInfo.user;
+        final String targetPackage = originalInfo.getTargetPackage();
         return () -> {
             ApplicationInfoWrapper infoWrapper =
-                    new ApplicationInfoWrapper(context, originalInfo.getTargetPackage(), user);
+                    new ApplicationInfoWrapper(context, targetPackage, user);
             List<ShortcutInfo> shortcuts = new ShortcutRequest(context, user)
                     .withContainer(activity)
                     .query(ShortcutRequest.PUBLISHED);