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 7e6107caaf)
This commit is contained in:
fbaron
2023-10-09 09:05:44 -07:00
committed by Federico Baron
parent a2a4b84db1
commit 9ffd90a85b

View File

@@ -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;
}