summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDharmesh Mokani <mokani@google.com>2014-08-27 20:15:54 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-08-27 20:15:55 +0000
commit74dc410bd19e07cde8702ad9c33dc1c25332d664 (patch)
tree6f5189cff85f15699b3076fe0f4b2f4a736139de
parent68eb6f7bae63b7d6f1de4aa8000a9c44cfb87d95 (diff)
parent11b85a283b7dd11d21aa614e9f0bf2652a4316d3 (diff)
downloadandroid_packages_apps_Trebuchet-74dc410bd19e07cde8702ad9c33dc1c25332d664.tar.gz
android_packages_apps_Trebuchet-74dc410bd19e07cde8702ad9c33dc1c25332d664.tar.bz2
android_packages_apps_Trebuchet-74dc410bd19e07cde8702ad9c33dc1c25332d664.zip
Merge "Remove StopShip from UserManagerCompactVl file." into ub-now-porkchop
-rw-r--r--src/com/android/launcher3/compat/UserManagerCompatVL.java7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/com/android/launcher3/compat/UserManagerCompatVL.java b/src/com/android/launcher3/compat/UserManagerCompatVL.java
index 0ad824b11..ad6f78e08 100644
--- a/src/com/android/launcher3/compat/UserManagerCompatVL.java
+++ b/src/com/android/launcher3/compat/UserManagerCompatVL.java
@@ -48,12 +48,7 @@ public class UserManagerCompatVL extends UserManagerCompatV17 {
@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