diff options
| author | Mathew Inwood <mathewi@google.com> | 2011-07-12 13:41:41 +0100 |
|---|---|---|
| committer | Mathew Inwood <mathewi@google.com> | 2011-07-12 13:51:22 +0100 |
| commit | 70d510293964eba0fca9377baef29d27cba3abf6 (patch) | |
| tree | 77fa64579e7afa605326be57f7bc047b5c6b1173 /src/com/android/launcher2/Launcher.java | |
| parent | a71cb1778dc0c7e76132d21296c58da777183e26 (diff) | |
| download | android_packages_apps_Trebuchet-70d510293964eba0fca9377baef29d27cba3abf6.tar.gz android_packages_apps_Trebuchet-70d510293964eba0fca9377baef29d27cba3abf6.tar.bz2 android_packages_apps_Trebuchet-70d510293964eba0fca9377baef29d27cba3abf6.zip | |
Don't crash if global search specified bad toolbar icon.
This should prevent a dodgy global search app crashing the launcher
and making it unusable.
Change-Id: Ia55a197a0c11de4ce24695313a3fa71fefa488e3
Diffstat (limited to 'src/com/android/launcher2/Launcher.java')
| -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 76866a7f1..c06a2ee70 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -2692,6 +2692,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; } |