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

This commit is contained in:
TreeHugger Robot
2017-10-04 12:40:39 +00:00
committed by Android (Google) Code Review

View File

@@ -5766,7 +5766,7 @@ public final class ActivityThread {
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) {