commit ccf441d436f1335d5e8de97b31b6c37de27319ee
author Mathew Inwood <mathewi@google.com> Tue Jul 12 10:12:13 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jul 12 10:12:13 2011 -0700
tree 8a7495412edda105b3557823964b0b50c0f3cb05
parent f8901b57afb1a085886993e427cc1a7b5eaa3879
parent 70d510293964eba0fca9377baef29d27cba3abf6

Merge "Don't crash if global search specified bad toolbar icon."

src/com/android/launcher2/Launcher.java

diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 5e500ba..4e69ee8 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -2707,6 +2707,10 @@
             }
         } catch (NameNotFoundException e) {
             // Do nothing
+        } catch (Resources.NotFoundException nfe) {
+            // This can happen if the activity defines an invalid drawable
+            Log.w(TAG, "Failed to load toolbar icon from " + activityName.flattenToShortString(),
+                    nfe);
         }
         return null;
     }