Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix divergent equals and hashCode behavior" into nyc-dev

Browse Source 
am: 2ff5780d90

* commit '2ff5780d903bb052fd9349b742d4d754f049202c':
  Fix divergent equals and hashCode behavior

Change-Id: I16809877a43fa3b3c70273de2a84a90e493d9caf
This commit is contained in:
Pavlin Radoslavov
2016-05-06 21:08:14 +00:00
committed by android-build-merger
parent 297785515b 2ff5780d90
commit 08f11bd631
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/java/android/bluetooth/le/ScanFilter.java
View File

@@ -385,9 +385,13 @@ public final class ScanFilter implements Parcelable {
@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 final class ScanFilter implements Parcelable {
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) &&