diff options
Diffstat (limited to 'core/java/android/content/res')
| -rw-r--r-- | core/java/android/content/res/Configuration.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/content/res/Configuration.java b/core/java/android/content/res/Configuration.java index 4ce1f62..57f7626 100644 --- a/core/java/android/content/res/Configuration.java +++ b/core/java/android/content/res/Configuration.java @@ -1033,8 +1033,9 @@ public final class Configuration implements Parcelable, Comparable<Configuration if (delta.themeConfig != null && (themeConfig == null || !themeConfig.equals(delta.themeConfig))) { changed |= ActivityInfo.CONFIG_THEME_RESOURCE; + final String fontPkgName = delta.themeConfig.getFontPkgName(); if (themeConfig == null || - !delta.themeConfig.getFontPkgName().equals(themeConfig.getFontPkgName())) { + (fontPkgName != null && !fontPkgName.equals(themeConfig.getFontPkgName()))) { changed |= ActivityInfo.CONFIG_THEME_FONT; } themeConfig = (ThemeConfig)delta.themeConfig.clone(); |