commit 348b13f597ce8604d46992486e9ea7d5bc3cc5ff
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Oct 04 12:40:39 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Oct 04 12:40:39 2017 +0000
tree 6533be6439eed4af02d82a20af3bd7eb0ce69132
parent 7a349d7288ddc3aa93edfcdc81c7347b828819e0
parent cb941157a2282191486f7bbefb961289401f6caa

Merge "Fix NPE in ActivityThread" into oc-mr1-dev

core/java/android/app/ActivityThread.java

diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java
index f01feea..45f7eba 100644
--- a/core/java/android/app/ActivityThread.java
+++ b/core/java/android/app/ActivityThread.java
@@ -5766,7 +5766,7 @@
                 final int preloadedFontsResource = info.metaData.getInt(
                         ApplicationInfo.METADATA_PRELOADED_FONTS, 0);
                 if (preloadedFontsResource != 0) {
-                    data.info.mResources.preloadFonts(preloadedFontsResource);
+                    data.info.getResources().preloadFonts(preloadedFontsResource);
                 }
             }
         } catch (RemoteException e) {