commit 37d1c0e1ab5fd4c8b35e388dd3740d3d5c627811
author Mark Brophy <mbrophy@google.com> Sat Aug 09 18:37:21 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sat Aug 09 18:37:21 2014 +0000
tree 95eacb1b53566f80b4813860bc2dd8e2ebc6a44d
parent 597a8ec85ce6dab28e110f63bbd44b270675304b
parent fd449c88316a1caca4f034a339c1e5128c5da849

am fd449c88: Make GEL not crashloop.

* commit 'fd449c88316a1caca4f034a339c1e5128c5da849':
  Make GEL not crashloop.

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

diff --git a/src/com/android/launcher3/compat/UserManagerCompatVL.java b/src/com/android/launcher3/compat/UserManagerCompatVL.java
index ad6f78e..0ad824b 100644
--- a/src/com/android/launcher3/compat/UserManagerCompatVL.java
+++ b/src/com/android/launcher3/compat/UserManagerCompatVL.java
@@ -48,7 +48,12 @@
 
     @Override
     public Drawable getBadgedDrawableForUser(Drawable unbadged, UserHandleCompat user) {
-        return mUserManager.getBadgedIconForUser(unbadged, user.getUser());
+        try {
+            // STOPSHIP(mokani): Clean this up.
+            return mUserManager.getBadgedIconForUser(unbadged, user.getUser());
+        } catch (Throwable t) {
+            return unbadged;
+        }
     }
 
     @Override