Themes: Handle null request types in ThemeConfig

1) Just use == for comparison instead of .equals()
2) Check for null when computing hashCode

Change-Id: I2edebc9f0224fe3dc0073866d6860afe252b8d71

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;
     }