From 39df0219d20d99e75a88e79d66b74309ba6e7ed2 Mon Sep 17 00:00:00 2001
From: Clark Scheff <clark@cyngn.com>
Date: Fri, 6 Mar 2015 13:30:01 -0800
Subject: Themes: Perform null check on fontPkgName

Change-Id: Idbbaf77ecb9b4d65e28d314f7b2d7f552e1e8989
---
 core/java/android/content/res/Configuration.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'core/java/android/content/res')

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();
-- 
cgit v1.1