From aff04c35ae4dd98bf1a0ea363e5708bd40cf2ad9 Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Tue, 10 Oct 2017 10:35:59 -0700
Subject: [PATCH] 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 dc92d925d819d2c385c04e49369e8574fa111d14)

---
 core/java/android/content/res/ResourcesImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/java/android/content/res/ResourcesImpl.java b/core/java/android/content/res/ResourcesImpl.java
index 23591c7893fb0..18e305bc899f0 100644
--- a/core/java/android/content/res/ResourcesImpl.java
+++ b/core/java/android/content/res/ResourcesImpl.java
@@ -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));