Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 29e6f569 authored by Clara Bayarri's avatar Clara Bayarri Committed by android-build-merger
Browse files

Merge "Fix NPE in ActivityThread" into oc-mr1-dev am: 348b13f5 

am: 889c0c0f

Change-Id: I93b731cd4a52828e1c3d00018d4c095ab0e508a3
parents 6c591dd3 889c0c0f

core/java/android/app/ActivityThread.java

+1 −1
Original line number Diff line number Diff line
@@ -5780,7 +5780,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) {