From 0d4b8a3b1984bce718a94f4fe7b9e3bdc2322d21 Mon Sep 17 00:00:00 2001 From: Doris Ling Date: Mon, 25 Jul 2016 13:22:30 -0700 Subject: [PATCH] Fix crash when support item is clicked. Check for existing activity to handle the support item intent before adding it to support tile or trying to launch the activity. Change-Id: I42a733c2d862b303773aeee1ba3b21b718e59066 Fixes: 29118295 --- .../dashboard/SupportItemAdapter.java | 35 ++++++++++++------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/src/com/android/settings/dashboard/SupportItemAdapter.java b/src/com/android/settings/dashboard/SupportItemAdapter.java index c5ff2a66537..4ee28c69c95 100644 --- a/src/com/android/settings/dashboard/SupportItemAdapter.java +++ b/src/com/android/settings/dashboard/SupportItemAdapter.java @@ -23,6 +23,7 @@ import android.app.Activity; import android.app.DialogFragment; import android.content.Context; import android.content.Intent; +import android.content.pm.PackageManager; import android.os.Bundle; import android.support.v7.widget.RecyclerView; import android.text.TextUtils; @@ -136,7 +137,8 @@ public final class SupportItemAdapter extends RecyclerView.Adapter= 0 && position < mSupportData.size()) { final SupportData data = mSupportData.get(position); - if (data.intent != null) { + if (data.intent != null && + mActivity.getPackageManager().resolveActivity(data.intent, 0) != null) { if (data.metricsEvent >= 0) { MetricsLogger.action(mActivity, data.metricsEvent); } @@ -283,18 +285,25 @@ public final class SupportItemAdapter extends RecyclerView.Adapter