| commit | eb8d8e8066218bb3c1bc61b9dae9a016019410cf | [log] [tgz] |
|---|---|---|
| author | fbaron <fbaron@google.com> | Thu Oct 12 21:23:31 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Oct 12 21:23:31 2023 +0000 |
| tree | 10c4bede0832b6ae9579936513e9c40c71f1c432 | |
| parent | b085f9e8195b101e947b67bdf5b88562f6844437 [diff] | |
| parent | 9ffd90a85b357ca4f8663ac3e1a1df72f2715466 [diff] |
Add NullPointerException to try/catch since it's possible to have such an error am: 9ffd90a85b Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/25031355 Change-Id: I935bb241e0b08ddb806f32d233ee359355d95df9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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; }