diff options
author | Kenny Guy <kennyguy@google.com> | 2014-09-11 13:44:05 +0100 |
---|---|---|
committer | Kenny Guy <kennyguy@google.com> | 2014-09-11 13:44:05 +0100 |
commit | 49909c2b336de95de2543af0ebe3b7554fe05a6c (patch) | |
tree | 0f40e5a93d6a77a5d4c62b1359f9c63692208926 | |
parent | 8e894faadfce1d779b94692d8c7eccf558e23727 (diff) | |
download | android_packages_apps_Trebuchet-49909c2b336de95de2543af0ebe3b7554fe05a6c.tar.gz android_packages_apps_Trebuchet-49909c2b336de95de2543af0ebe3b7554fe05a6c.tar.bz2 android_packages_apps_Trebuchet-49909c2b336de95de2543af0ebe3b7554fe05a6c.zip |
Catch Throwable as NoSuchMethodError isn't an Exception.
Bug: 17462165
Change-Id: Ifafdc882fd1020fb6468d2bcae2f219ef5cba64c
-rw-r--r-- | src/com/android/launcher3/compat/AppWidgetManagerCompatVL.java | 2 | ||||
-rw-r--r-- | src/com/android/launcher3/compat/UserManagerCompatVL.java | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/com/android/launcher3/compat/AppWidgetManagerCompatVL.java b/src/com/android/launcher3/compat/AppWidgetManagerCompatVL.java index 30af38ef9..7ca35b72d 100644 --- a/src/com/android/launcher3/compat/AppWidgetManagerCompatVL.java +++ b/src/com/android/launcher3/compat/AppWidgetManagerCompatVL.java @@ -127,7 +127,7 @@ class AppWidgetManagerCompatVL extends AppWidgetManagerCompat { try { drawable = mPm.getUserBadgedDrawableForDensity(new BitmapDrawable(res, bitmap), info.getProfile(), badgeLocation, 0); - } catch (Exception e) { + } catch (Throwable e) { return bitmap; } diff --git a/src/com/android/launcher3/compat/UserManagerCompatVL.java b/src/com/android/launcher3/compat/UserManagerCompatVL.java index e54db617e..ddef43148 100644 --- a/src/com/android/launcher3/compat/UserManagerCompatVL.java +++ b/src/com/android/launcher3/compat/UserManagerCompatVL.java @@ -55,7 +55,7 @@ public class UserManagerCompatVL extends UserManagerCompatV17 { // This hack is just to prevent crash in older builds. try { return mPm.getUserBadgedIcon(unbadged, user.getUser()); - } catch (Exception e) { + } catch (Throwable e) { return unbadged; } } @@ -68,8 +68,8 @@ public class UserManagerCompatVL extends UserManagerCompatV17 { // 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 (Exception e) { + return mPm.getUserBadgedLabel(label, user.getUser()); + } catch (Throwable e) { return label; } } |