diff options
| author | Mathew Inwood <mathewi@google.com> | 2011-07-12 10:12:13 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-07-12 10:12:13 -0700 |
| commit | ccf441d436f1335d5e8de97b31b6c37de27319ee (patch) | |
| tree | 8a7495412edda105b3557823964b0b50c0f3cb05 /src | |
| parent | f8901b57afb1a085886993e427cc1a7b5eaa3879 (diff) | |
| parent | 70d510293964eba0fca9377baef29d27cba3abf6 (diff) | |
| download | android_packages_apps_Trebuchet-ccf441d436f1335d5e8de97b31b6c37de27319ee.tar.gz android_packages_apps_Trebuchet-ccf441d436f1335d5e8de97b31b6c37de27319ee.tar.bz2 android_packages_apps_Trebuchet-ccf441d436f1335d5e8de97b31b6c37de27319ee.zip | |
Merge "Don't crash if global search specified bad toolbar icon."
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher2/Launcher.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index 5e500ba76..4e69ee82a 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -2707,6 +2707,10 @@ public final class Launcher extends Activity } } 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; } |