am cc4e84ee: Merge "Remove STOPSHIPs from GSA 4.0" into ub-now-porkchop

* commit 'cc4e84ee3bf5be23b30dc06c3c861391e92ed633':
  Remove STOPSHIPs from GSA 4.0

3 files changed, 7 insertions, 33 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();
diff --git a/src/com/android/launcher3/compat/PackageInstallerCompatVL.java b/src/com/android/launcher3/compat/PackageInstallerCompatVL.java
index 9a0831f0e..4ad10d870 100644
--- a/src/com/android/launcher3/compat/PackageInstallerCompatVL.java
+++ b/src/com/android/launcher3/compat/PackageInstallerCompatVL.java
@@ -47,11 +47,7 @@ public class PackageInstallerCompatVL extends PackageInstallerCompat {
         mResumed = false;
         mBound = false;
 
-        // STOPSHIP(mokani): Remove catch block once dogfood build is bigger than LRW70.
-        // This hack is just to prevent crash in older builds.
-        try {
-            mInstaller.registerSessionCallback(mCallback);
-        } catch (Throwable e) { }
+        mInstaller.registerSessionCallback(mCallback);
 
         // On start, send updates for all active sessions
         for (SessionInfo info : mInstaller.getAllSessions()) {
@@ -77,11 +73,7 @@ public class PackageInstallerCompatVL extends PackageInstallerCompat {
 
     @Override
     public void onStop() {
-        // STOPSHIP(mokani): Remove catch block once dogfood build is bigger than LRW70.
-        // This hack is just to prevent crash in older builds.
-        try {
-            mInstaller.unregisterSessionCallback(mCallback);
-        } catch (Throwable e) { }
+        mInstaller.unregisterSessionCallback(mCallback);
     }
 
     @Override
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());
     }
 }