diff options
author | Dharmesh Mokani <mokani@google.com> | 2014-09-09 15:23:00 -0700 |
---|---|---|
committer | Dharmesh Mokani <mokani@google.com> | 2014-09-12 10:22:51 -0700 |
commit | 3d0854e4b8c0a6daaa80ac14c6bc7572a4e90916 (patch) | |
tree | 8f7213bb5ecde4a939c4f9f8269a8e052a24974c /src/com/android/launcher3/compat/UserManagerCompatVL.java | |
parent | 5b7d28fc4c44f9952ca6907b05f9f364c8d383aa (diff) | |
download | android_packages_apps_Trebuchet-3d0854e4b8c0a6daaa80ac14c6bc7572a4e90916.tar.gz android_packages_apps_Trebuchet-3d0854e4b8c0a6daaa80ac14c6bc7572a4e90916.tar.bz2 android_packages_apps_Trebuchet-3d0854e4b8c0a6daaa80ac14c6bc7572a4e90916.zip |
Remove STOPSHIPs from GSA 4.0
Added stopships so that GSA won't crash on older L release.
Bug: 17443440
Change-Id: I792eb53d5021118bdb09c44ffae7a8286a0cd69b
Diffstat (limited to 'src/com/android/launcher3/compat/UserManagerCompatVL.java')
-rw-r--r-- | src/com/android/launcher3/compat/UserManagerCompatVL.java | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/src/com/android/launcher3/compat/UserManagerCompatVL.java b/src/com/android/launcher3/compat/UserManagerCompatVL.java index ddef43148..19eeabdcf 100644 --- a/src/com/android/launcher3/compat/UserManagerCompatVL.java +++ b/src/com/android/launcher3/compat/UserManagerCompatVL.java @@ -51,13 +51,7 @@ public class UserManagerCompatVL extends UserManagerCompatV17 { @Override public Drawable getBadgedDrawableForUser(Drawable unbadged, UserHandleCompat user) { - // STOPSHIP(mokani): Remove catch block once dogfood build is bigger than LRW70. - // This hack is just to prevent crash in older builds. - try { - return mPm.getUserBadgedIcon(unbadged, user.getUser()); - } catch (Throwable e) { - return unbadged; - } + return mPm.getUserBadgedIcon(unbadged, user.getUser()); } @Override @@ -65,13 +59,7 @@ public class UserManagerCompatVL extends UserManagerCompatV17 { if (user == null) { return label; } - // STOPSHIP(mokani): Remove catch block once dogfood build is bigger than LRW70. - // This hack is just to prevent crash in older builds. - try { - return mPm.getUserBadgedLabel(label, user.getUser()); - } catch (Throwable e) { - return label; - } + return mPm.getUserBadgedLabel(label, user.getUser()); } } |