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

Commit 348b13f5 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 7a349d72 cb941157

core/java/android/app/ActivityThread.java

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