Merge "Fix divergent equals and hashCode behavior"

dayi · May 6, 2016 · e8579b1 · e8579b1
2 parents 04a7cfc + f74b830
commit e8579b1
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/core/java/android/bluetooth/le/ScanFilter.java b/core/java/android/bluetooth/le/ScanFilter.java
@@ -385,9 +385,13 @@ public String toString() {
 
     @Override
     public int hashCode() {
-        return Objects.hash(mDeviceName, mDeviceAddress, mManufacturerId, mManufacturerData,
-                mManufacturerDataMask, mServiceDataUuid, mServiceData, mServiceDataMask,
-                mServiceUuid, mServiceUuidMask);
+        return Objects.hash(mDeviceName, mDeviceAddress, mManufacturerId,
+                            Arrays.hashCode(mManufacturerData),
+                            Arrays.hashCode(mManufacturerDataMask),
+                            mServiceDataUuid,
+                            Arrays.hashCode(mServiceData),
+                            Arrays.hashCode(mServiceDataMask),
+                            mServiceUuid, mServiceUuidMask);
     }
 
     @Override
@@ -401,10 +405,10 @@ public boolean equals(Object obj) {
         ScanFilter other = (ScanFilter) obj;
         return Objects.equals(mDeviceName, other.mDeviceName) &&
                 Objects.equals(mDeviceAddress, other.mDeviceAddress) &&
-                        mManufacturerId == other.mManufacturerId &&
+                mManufacturerId == other.mManufacturerId &&
                 Objects.deepEquals(mManufacturerData, other.mManufacturerData) &&
                 Objects.deepEquals(mManufacturerDataMask, other.mManufacturerDataMask) &&
-                Objects.deepEquals(mServiceDataUuid, other.mServiceDataUuid) &&
+                Objects.equals(mServiceDataUuid, other.mServiceDataUuid) &&
                 Objects.deepEquals(mServiceData, other.mServiceData) &&
                 Objects.deepEquals(mServiceDataMask, other.mServiceDataMask) &&
                 Objects.equals(mServiceUuid, other.mServiceUuid) &&