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/AppWidgetManagerCompatVL.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/AppWidgetManagerCompatVL.java')
| -rw-r--r-- | src/com/android/launcher3/compat/AppWidgetManagerCompatVL.java | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/com/android/launcher3/compat/AppWidgetManagerCompatVL.java b/src/com/android/launcher3/compat/AppWidgetManagerCompatVL.java index 7ca35b72d..c3853ab62 100644 --- a/src/com/android/launcher3/compat/AppWidgetManagerCompatVL.java +++ b/src/com/android/launcher3/compat/AppWidgetManagerCompatVL.java @@ -121,15 +121,9 @@ class AppWidgetManagerCompatVL extends AppWidgetManagerCompat { } else { badgeLocation.offset(bitmap.getWidth() - badgeSize - badgeMargin, top); } - Drawable drawable = null; - // STOPSHIP(mokani): Remove catch block once dogfood build is bigger than LRW70. - // This hack is just to prevent crash in older builds. - try { - drawable = mPm.getUserBadgedDrawableForDensity(new BitmapDrawable(res, bitmap), - info.getProfile(), badgeLocation, 0); - } catch (Throwable e) { - return bitmap; - } + + Drawable drawable = mPm.getUserBadgedDrawableForDensity( + new BitmapDrawable(res, bitmap), info.getProfile(), badgeLocation, 0); if (drawable instanceof BitmapDrawable) { return ((BitmapDrawable) drawable).getBitmap(); |