| commit | 3702ce391d41244a719fc56298f4e139d6fbd223 | [log] [tgz] |
|---|---|---|
| author | Hyunyoung Song <hyunyoungs@google.com> | Tue Oct 10 22:30:23 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Oct 10 22:30:23 2017 +0000 |
| tree | 34c845346eeceda34009852219a959888cfdd06c | |
| parent | 245ecc9a95a22e7d54744c23a9efa8dffa28fb8d [diff] | |
| parent | 384689934d293acf532e3fea3e72ef78df4f2d1e [diff] |
Merge "Wrap StackOverflowError in NotFoundException. Bug: 67462465 Test: builds and tested using faulty apk with recursive drawable. Change-Id: I47691343dae892beb5ed8c1c66c33edefade321e" into oc-mr1-dev am: 384689934d Change-Id: Id4885fe270e24d54830d6858e37487de551a3f52
diff --git a/core/java/android/content/res/ResourcesImpl.java b/core/java/android/content/res/ResourcesImpl.java index a8b8c4b..386239c 100644 --- a/core/java/android/content/res/ResourcesImpl.java +++ b/core/java/android/content/res/ResourcesImpl.java
@@ -796,7 +796,7 @@ dr = Drawable.createFromResourceStream(wrapper, value, is, file, null); is.close(); } - } catch (Exception e) { + } catch (Exception | StackOverflowError e) { Trace.traceEnd(Trace.TRACE_TAG_RESOURCES); final NotFoundException rnf = new NotFoundException( "File " + file + " from drawable resource ID #0x" + Integer.toHexString(id));