Commit 9ffd90a8 authored Oct 09, 2023 by fbaron Committed by Federico Baron Oct 12, 2023

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

parent a2a4b84d

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -107,7 +107,7 @@ public class ShortcutCachingLogic implements CachingLogic<ShortcutInfo> {
		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;
		}