From 259723de32428a62f518263c3079ba0e4eba29e4 Mon Sep 17 00:00:00 2001 From: Holly Sun Date: Tue, 22 Nov 2022 11:54:13 -0800 Subject: [PATCH] Catch exception to prevent crash. Bug: 258234624 Test: QA verify Change-Id: I31df77b33f19426d136673d1ce9866fa6e60729c --- .../android/launcher3/touch/ItemClickHandler.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/com/android/launcher3/touch/ItemClickHandler.java b/src/com/android/launcher3/touch/ItemClickHandler.java index b4be06159a..098cf80a3a 100644 --- a/src/com/android/launcher3/touch/ItemClickHandler.java +++ b/src/com/android/launcher3/touch/ItemClickHandler.java @@ -28,6 +28,7 @@ import static com.android.launcher3.model.data.ItemInfoWithIcon.FLAG_DISABLED_SU import android.app.AlertDialog; import android.app.PendingIntent; +import android.content.ActivityNotFoundException; import android.content.Context; import android.content.Intent; import android.content.IntentSender; @@ -315,10 +316,16 @@ public class ItemClickHandler { */ public static void onClickSearchAction(Launcher launcher, SearchActionItemInfo itemInfo) { if (itemInfo.getIntent() != null) { - if (itemInfo.hasFlags(SearchActionItemInfo.FLAG_SHOULD_START_FOR_RESULT)) { - launcher.startActivityForResult(itemInfo.getIntent(), 0); - } else { - launcher.startActivity(itemInfo.getIntent()); + try { + if (itemInfo.hasFlags(SearchActionItemInfo.FLAG_SHOULD_START_FOR_RESULT)) { + launcher.startActivityForResult(itemInfo.getIntent(), 0); + } else { + launcher.startActivity(itemInfo.getIntent()); + } + } catch (ActivityNotFoundException e) { + Toast.makeText(launcher, + launcher.getResources().getText(R.string.shortcut_not_available), + Toast.LENGTH_SHORT).show(); } } else if (itemInfo.getPendingIntent() != null) { try {