[automerger skipped] Migrate messaging to aapt2. am: a75d7022fc
am: d037073df0 -s ours
Change-Id: I3194bd112e91c694cd4d231a62c36305e396452e
diff --git a/src/com/android/messaging/datamodel/media/GifImageResource.java b/src/com/android/messaging/datamodel/media/GifImageResource.java
index 6801165..cbea1ee 100644
--- a/src/com/android/messaging/datamodel/media/GifImageResource.java
+++ b/src/com/android/messaging/datamodel/media/GifImageResource.java
@@ -58,10 +58,10 @@
public Drawable getDrawable(Resources resources) {
try {
return new FrameSequenceDrawable(mFrameSequence);
- } catch (final Exception e) {
- // Malicious gif images can make platform throw different kind of exceptions. Catch
- // them all.
- LogUtil.e(LogUtil.BUGLE_TAG, "Error getting drawable for GIF", e);
+ } catch (final Throwable t) {
+ // Malicious gif images can make the platform throw different kind of throwables, such
+ // as OutOfMemoryError and NullPointerException. Catch them all.
+ LogUtil.e(LogUtil.BUGLE_TAG, "Error getting drawable for GIF", t);
return null;
}
}
diff --git a/tests/Android.mk b/tests/Android.mk
index b906684..dc1999b 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -32,7 +32,11 @@
LOCAL_STATIC_JAVA_LIBRARIES := \
mockito-target
-LOCAL_JAVA_LIBRARIES := android.test.mock.stubs legacy-android-test
+LOCAL_JAVA_LIBRARIES := \
+ android.test.mock.stubs \
+ android.test.runner.stubs \
+ android.test.base.stubs \
+
include $(BUILD_PACKAGE)