Merge "Updating the widget tray" into ub-now-porkchop
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