commit 74dc410bd19e07cde8702ad9c33dc1c25332d664
author Dharmesh Mokani <mokani@google.com> Wed Aug 27 20:15:54 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 27 20:15:55 2014 +0000
tree 6f5189cff85f15699b3076fe0f4b2f4a736139de
parent 68eb6f7bae63b7d6f1de4aa8000a9c44cfb87d95
parent 11b85a283b7dd11d21aa614e9f0bf2652a4316d3

Merge "Remove StopShip from UserManagerCompactVl file." into ub-now-porkchop

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