diff options
| author | Clark Scheff <clark@cyngn.com> | 2015-03-06 13:30:01 -0800 |
|---|---|---|
| committer | Clark Scheff <clark@cyngn.com> | 2015-10-27 17:56:29 -0700 |
| commit | 39df0219d20d99e75a88e79d66b74309ba6e7ed2 (patch) | |
| tree | 9a209773f0814464968e31800ed7ff46ccf0678b | |
| parent | 86069604c1e44fc6e46e219d982c70999bcf6a48 (diff) | |
| download | frameworks_base-39df0219d20d99e75a88e79d66b74309ba6e7ed2.zip frameworks_base-39df0219d20d99e75a88e79d66b74309ba6e7ed2.tar.gz frameworks_base-39df0219d20d99e75a88e79d66b74309ba6e7ed2.tar.bz2 | |
Themes: Perform null check on fontPkgName
Change-Id: Idbbaf77ecb9b4d65e28d314f7b2d7f552e1e8989
| -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(); |