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

Commit 3aab9561 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
am: 69d240d5

Change-Id: I02bf540b41fd9fd026fbe0fad4069526664cd56f
parents f523fe4f 69d240d5

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -815,7 +815,7 @@ public class ResourcesImpl { 
            } finally {

            } finally {

                stack.pop();

                stack.pop();

            }

            }

        } 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));