commit 958315e8ef448641a75401acff1e4cb38fd776e7
author Kenny Guy <kennyguy@google.com> Tue May 27 16:34:59 2014 +0100
committer Adam Cohen <adamcohen@google.com> Fri Jun 13 18:36:26 2014 +0000
tree ef2ee472389eb371f5fb43b6934b232d2161849f
parent 6ea3b116fc2eea7cc1a6892c548da45a4f581a1d

Add catch for missing app icon resource.

The catch was present before moving the code into
the compat class.

Bug: 15276879
Change-Id: I81fbd49dacd813e861a2bc4f0b41dcbeccb9def2
(cherry picked from commit c879052247b1000b9f318294024daa3c9d100621)

src/com/android/launcher3/compat/LauncherActivityInfoCompatV16.java

diff --git a/src/com/android/launcher3/compat/LauncherActivityInfoCompatV16.java b/src/com/android/launcher3/compat/LauncherActivityInfoCompatV16.java
index 9b9384d..052d434 100644
--- a/src/com/android/launcher3/compat/LauncherActivityInfoCompatV16.java
+++ b/src/com/android/launcher3/compat/LauncherActivityInfoCompatV16.java
@@ -61,7 +61,11 @@
                 resources = null;
             }
             if (resources != null) {
-                d = resources.getDrawableForDensity(mActivityInfo.getIconResource(), density);
+                try {
+                    d = resources.getDrawableForDensity(mActivityInfo.getIconResource(), density);
+                } catch (Resources.NotFoundException e) {
+                    // Return default icon below.
+                }
             }
         }
         if (d == null) {