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
This commit is contained in:
TreeHugger Robot
2017-10-04 12:40:39 +00:00
committed by Android (Google) Code Review
parent 7a349d7288 cb941157a2
commit 348b13f597
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( final int preloadedFontsResource = info.metaData.getInt(
ApplicationInfo.METADATA_PRELOADED_FONTS, 0); ApplicationInfo.METADATA_PRELOADED_FONTS, 0);
if (preloadedFontsResource != 0) { if (preloadedFontsResource != 0) {
data.info.mResources.preloadFonts(preloadedFontsResource); data.info.getResources().preloadFonts(preloadedFontsResource);
} }
} }
} catch (RemoteException e) { } catch (RemoteException e) {