Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Wrap StackOverflowError in NotFoundException. Bug: 67462465 Test: builds and tested using faulty apk with recursive drawable. Change-Id: I47691343dae892beb5ed8c1c66c33edefade321e" into oc-mr1-dev

Browse Source 
am: 384689934d

Change-Id: Id4885fe270e24d54830d6858e37487de551a3f52
This commit is contained in:
Hyunyoung Song
2017-10-10 22:30:23 +00:00
committed by android-build-merger
parent 245ecc9a95 384689934d
commit 3702ce391d
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/content/res/ResourcesImpl.java
View File

@@ -796,7 +796,7 @@ public class ResourcesImpl {
dr = Drawable.createFromResourceStream(wrapper, value, is, file, null); dr = Drawable.createFromResourceStream(wrapper, value, is, file, null);
is.close(); is.close();
} }
} catch (Exception e) { } catch (Exception | StackOverflowError e) {
Trace.traceEnd(Trace.TRACE_TAG_RESOURCES); Trace.traceEnd(Trace.TRACE_TAG_RESOURCES);
final NotFoundException rnf = new NotFoundException( final NotFoundException rnf = new NotFoundException(
"File " + file + " from drawable resource ID #0x" + Integer.toHexString(id)); "File " + file + " from drawable resource ID #0x" + Integer.toHexString(id));