diff options
author | Dharmesh Mokani <mokani@google.com> | 2014-08-28 10:34:09 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-28 10:34:09 +0000 |
commit | 93423259c990af4b5ce7268c209cfa20bc6d36c2 (patch) | |
tree | e2a47fdfa31539a16b67dfb1a56b9b76197bae9e | |
parent | 1ac363fc4d042d83a2aa15cc0e9ad0a53671cf02 (diff) | |
parent | 74dc410bd19e07cde8702ad9c33dc1c25332d664 (diff) | |
download | android_packages_apps_Trebuchet-93423259c990af4b5ce7268c209cfa20bc6d36c2.tar.gz android_packages_apps_Trebuchet-93423259c990af4b5ce7268c209cfa20bc6d36c2.tar.bz2 android_packages_apps_Trebuchet-93423259c990af4b5ce7268c209cfa20bc6d36c2.zip |
am 74dc410b: Merge "Remove StopShip from UserManagerCompactVl file." into ub-now-porkchop
* commit '74dc410bd19e07cde8702ad9c33dc1c25332d664':
Remove StopShip from UserManagerCompactVl file.
-rw-r--r-- | src/com/android/launcher3/compat/UserManagerCompatVL.java | 7 |
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 |