am 74dc410b: Merge "Remove StopShip from UserManagerCompactVl file." into ub-now-porkchop

* commit '74dc410bd19e07cde8702ad9c33dc1c25332d664':
  Remove StopShip from UserManagerCompactVl file.
This commit is contained in:
Dharmesh Mokani
2014-08-28 10:34:09 +00:00
committed by Android Git Automerger
@@ -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