Merge "Introduce early exit path for non resource path." into oc-dev

am: 01d5b3d2af Change-Id: I07120a86307dd397862e0d341763d0048b066845
2017-05-18 23:39:41 +00:00
parent 7289c0a98e 01d5b3d2af
commit 99c587a9b1
9 changed files with 333 additions and 0 deletions
--- a/core/java/android/content/res/ResourcesImpl.java
+++ b/core/java/android/content/res/ResourcesImpl.java
@@ -772,6 +772,10 @@ public class ResourcesImpl {
        }

        final String file = value.string.toString();
+        if (!file.startsWith("res/")) {
+            return null;
+        }
+
        Typeface cached = Typeface.findFromCache(mAssets, file);
        if (cached != null) {
            return cached;