commit 9ffd90a85b357ca4f8663ac3e1a1df72f2715466
author fbaron <fbaron@google.com> Mon Oct 09 09:05:44 2023 -0700
committer Federico Baron <fbaron@google.com> Thu Oct 12 17:02:28 2023 +0000
tree b363e08c36500d7e5c53b989df2a1bea6143ac2a
parent a2a4b84db144782c3b746c14a40d218a7050d703

Add NullPointerException to try/catch since it's possible to have such an error

getShortcutIconDrawable could return null "Method invocation 'getShortcutIconDrawable' may produce 'NullPointerException'" and it leads to the code crashing. Adding  NullPointerException as one of the exceptions in the try/catch would resolve this issue

Fix: 299525046
Test: verify after merging that the null pointer exception stops occurring
Flag: no flag
Change-Id: I52cfba9c7b08ea4e1b0f4506c461e79c3e91dc6c
(cherry picked from commit 7e6107caafab310ce81636847ce68bf85d83d2db)

src/com/android/launcher3/icons/ShortcutCachingLogic.java

diff --git a/src/com/android/launcher3/icons/ShortcutCachingLogic.java b/src/com/android/launcher3/icons/ShortcutCachingLogic.java
index bb7248f..1791539 100644
--- a/src/com/android/launcher3/icons/ShortcutCachingLogic.java
+++ b/src/com/android/launcher3/icons/ShortcutCachingLogic.java
@@ -107,7 +107,7 @@
         try {
             return context.getSystemService(LauncherApps.class)
                     .getShortcutIconDrawable(shortcutInfo, density);
-        } catch (SecurityException | IllegalStateException e) {
+        } catch (SecurityException | IllegalStateException | NullPointerException e) {
             Log.e(TAG, "Failed to get shortcut icon", e);
             return null;
         }