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

Commit 2c4b7799 authored by Clark Scheff's avatar Clark Scheff Committed by Steve Kondik
Browse files

Themes: Perform null check on fontPkgName 

Change-Id: Idbbaf77ecb9b4d65e28d314f7b2d7f552e1e8989
parent f042d48b

core/java/android/content/res/Configuration.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -1004,8 +1004,9 @@ public final class Configuration implements Parcelable, Comparable<Configuration 
        if (delta.themeConfig != null

        if (delta.themeConfig != null

                && (themeConfig == null || !themeConfig.equals(delta.themeConfig))) {

                && (themeConfig == null || !themeConfig.equals(delta.themeConfig))) {

            changed |= ActivityInfo.CONFIG_THEME_RESOURCE;

            changed |= ActivityInfo.CONFIG_THEME_RESOURCE;

            final String fontPkgName = delta.themeConfig.getFontPkgName();

            if (themeConfig == null ||

            if (themeConfig == null ||

                    !delta.themeConfig.getFontPkgName().equals(themeConfig.getFontPkgName())) {

                    (fontPkgName != null && !fontPkgName.equals(themeConfig.getFontPkgName()))) {

                changed |= ActivityInfo.CONFIG_THEME_FONT;

                changed |= ActivityInfo.CONFIG_THEME_FONT;

            }

            }

            themeConfig = (ThemeConfig)delta.themeConfig.clone();

            themeConfig = (ThemeConfig)delta.themeConfig.clone();