Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 69d240d5 authored by Hyunyoung Song's avatar Hyunyoung Song Committed by android-build-merger
Browse files

Merge "Wrap StackOverflowError in NotFoundException. Bug: 67462465 Bug:... 

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 dc92d925)" into oc-dev
am: 48df0336

Change-Id: Id2510b388bf4ed9cdd8853bc5594349df358f465
parents 800e0613 48df0336

core/java/android/content/res/ResourcesImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -763,7 +763,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));