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

Merge "Wrap StackOverflowError in NotFoundException. Bug: 67462465 Bug: 66498711 Test: builds and tested using faulty apk with recursive drawable. Change-Id: I47691343dae892beb5ed8c1c66c33edefade321e (cherry picked from commit dc92d925d8)" into oc-dev am: 48df033607

Browse Source 
am: 69d240d584

Change-Id: I02bf540b41fd9fd026fbe0fad4069526664cd56f
This commit is contained in:
Hyunyoung Song
2018-01-12 05:44:25 +00:00
committed by android-build-merger
parent f523fe4fa7 69d240d584
commit 3aab9561b2
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

@@ -815,7 +815,7 @@ public class ResourcesImpl {
} finally {
stack.pop();
}
} 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));