Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 348b13f597

Change-Id: I4ac05199b93902bb19fd6eb42563e9c4fa00ed6c
This commit is contained in:
Clara Bayarri
2017-10-04 12:51:59 +00:00
committed by android-build-merger
parent 99ae0aed0d 348b13f597
commit 889c0c0f12
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/app/ActivityThread.java
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) {