From 4ced26a5aa82c6b996aaae3161de29b5bab2779e Mon Sep 17 00:00:00 2001 From: Stevespear426 Date: Tue, 5 Mar 2013 22:11:16 +0100 Subject: [PATCH] Navring: fix NPE if app uninstalled and in Navring remove generic exception not needed. Change-Id: Iec7f79f9d7c236d2afe3788dc35f890b2e3c4f84 --- .../com/android/internal/util/jellybam/NavRingHelpers.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/core/java/com/android/internal/util/jellybam/NavRingHelpers.java b/core/java/com/android/internal/util/jellybam/NavRingHelpers.java index 71c40ed6bed..6730b501d10 100644 --- a/core/java/com/android/internal/util/jellybam/NavRingHelpers.java +++ b/core/java/com/android/internal/util/jellybam/NavRingHelpers.java @@ -102,6 +102,12 @@ public static TargetDrawable getTargetDrawable(Context context, String action) { PackageManager pm = context.getPackageManager(); ActivityInfo info = intent.resolveActivityInfo(pm, PackageManager.GET_ACTIVITIES); + if (info == null) { + TargetDrawable drawable = new TargetDrawable(res, com.android.internal.R.drawable.ic_action_empty); + drawable.setEnabled(false); + return drawable; + } + Drawable activityIcon = info.loadIcon(pm); Drawable iconBg = res.getDrawable( com.android.internal.R.drawable.ic_navbar_blank);