diff options
Diffstat (limited to 'core/java/android/content/res')
| -rw-r--r-- | core/java/android/content/res/ThemeConfig.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/java/android/content/res/ThemeConfig.java b/core/java/android/content/res/ThemeConfig.java index 052f694..ea20f09 100644 --- a/core/java/android/content/res/ThemeConfig.java +++ b/core/java/android/content/res/ThemeConfig.java @@ -140,7 +140,7 @@ public class ThemeConfig implements Cloneable, Parcelable, Comparable<ThemeConfi new HashMap<String, AppTheme>() : o.mThemes; return (currThemes.equals(newThemes) && - mLastThemeChangeRequestType.equals(o.mLastThemeChangeRequestType)); + mLastThemeChangeRequestType == o.mLastThemeChangeRequestType); } return false; } @@ -159,7 +159,8 @@ public class ThemeConfig implements Cloneable, Parcelable, Comparable<ThemeConfi public int hashCode() { int hash = 17; hash = 31 * hash + mThemes.hashCode(); - hash = 31 * hash + mLastThemeChangeRequestType.ordinal(); + hash = 31 * hash + (mLastThemeChangeRequestType == null ? 0 : + mLastThemeChangeRequestType.ordinal()); return hash; } |