Navring: fix NPE if app uninstalled and in Navring

remove generic exception not needed. Change-Id: Iec7f79f9d7c236d2afe3788dc35f890b2e3c4f84
iGio90 · Mar 9, 2013 · 4ced26a · 4ced26a
1 parent e50a41c
commit 4ced26a
Showing 1 changed file with 6 additions and 0 deletions.
diff --git 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);