summaryrefslogtreecommitdiffstats
path: root/core/java/android/content
diff options
context:
space:
mode:
authord34d <clark@cyngn.com>2015-02-18 17:49:45 -0800
committerClark Scheff <clark@cyngn.com>2015-10-27 10:40:19 -0700
commitc7a61d7ef887a3f276e30cd7634b33111aba39ce (patch)
tree327b8f86e07c0afd53f2ae88f282622832fdd5b9 /core/java/android/content
parenta0109b463a29072a1afcee1780deb884e811b8c3 (diff)
downloadframeworks_base-c7a61d7ef887a3f276e30cd7634b33111aba39ce.zip
frameworks_base-c7a61d7ef887a3f276e30cd7634b33111aba39ce.tar.gz
frameworks_base-c7a61d7ef887a3f276e30cd7634b33111aba39ce.tar.bz2
Themes: Get mFontPkgName hashCode not mIconPkgName's
This fixes an infinite crash when a user applies a font and does not have any icons applied. Change-Id: I6ccd206c5ec9a732016876b2b4e3a835806a22b1
Diffstat (limited to 'core/java/android/content')
-rw-r--r--core/java/android/content/res/ThemeConfig.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/content/res/ThemeConfig.java b/core/java/android/content/res/ThemeConfig.java
index b1a6d90..61c37c3 100644
--- a/core/java/android/content/res/ThemeConfig.java
+++ b/core/java/android/content/res/ThemeConfig.java
@@ -275,7 +275,7 @@ public class ThemeConfig implements Cloneable, Parcelable, Comparable<ThemeConfi
int hash = 17;
hash = 31 * hash + (mOverlayPkgName == null ? 0 : mOverlayPkgName.hashCode());
hash = 31 * hash + (mIconPkgName == null ? 0 : mIconPkgName.hashCode());
- hash = 31 * hash + (mFontPkgName == null ? 0 : mIconPkgName.hashCode());
+ hash = 31 * hash + (mFontPkgName == null ? 0 : mFontPkgName.hashCode());
return hash;
}