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
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 76866a7..c06a2ee 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -2692,6 +2692,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;
}