Merge "Using ApplicationContext in static objects" into ub-now-porkchop
diff --git a/src/com/android/launcher3/compat/AppWidgetManagerCompatVL.java b/src/com/android/launcher3/compat/AppWidgetManagerCompatVL.java
index 7ca35b7..c3853ab 100644
--- a/src/com/android/launcher3/compat/AppWidgetManagerCompatVL.java
+++ b/src/com/android/launcher3/compat/AppWidgetManagerCompatVL.java
@@ -121,15 +121,9 @@
} 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 9a0831f..4ad10d8 100644
--- a/src/com/android/launcher3/compat/PackageInstallerCompatVL.java
+++ b/src/com/android/launcher3/compat/PackageInstallerCompatVL.java
@@ -47,11 +47,7 @@
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 @@
@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 ddef431..19eeabd 100644
--- a/src/com/android/launcher3/compat/UserManagerCompatVL.java
+++ b/src/com/android/launcher3/compat/UserManagerCompatVL.java
@@ -51,13 +51,7 @@
@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 @@
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());
}
}