diff options
| author | 2017-10-10 22:42:02 +0000 | |
|---|---|---|
| committer | 2017-10-10 22:42:02 +0000 | |
| commit | a91a0c5dc41b6eb5d15a6dd38abef1ebf900346f (patch) | |
| tree | f76f33dbe81e533d2d5aac78a558280b8862aa5b | |
| parent | df2a7f9f9d14e1d1a49a71dc0e0fc386c6063b52 (diff) | |
| parent | 3702ce391d41244a719fc56298f4e139d6fbd223 (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
am: 3702ce391d
Change-Id: I2ca8d4fb271245e3fc9b7f406456e3dc54dd96cd
| -rw-r--r-- | core/java/android/content/res/ResourcesImpl.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/content/res/ResourcesImpl.java b/core/java/android/content/res/ResourcesImpl.java index a8b8c4b5cd43..386239cf4f93 100644 --- a/core/java/android/content/res/ResourcesImpl.java +++ b/core/java/android/content/res/ResourcesImpl.java @@ -796,7 +796,7 @@ public class ResourcesImpl { 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)); |