Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 39c9de11 authored by Pavlin Radoslavov's avatar Pavlin Radoslavov Committed by android-build-merger
Browse files

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

Merge "Merge "Fix divergent equals and hashCode behavior" into nyc-dev am: 2ff5780d am: 08f11bd6" into nyc-mr1-dev-plus-aosp
am: 947cfbda

* commit '947cfbda':
  Fix divergent equals and hashCode behavior

Change-Id: Ia7bd09b91752f4c23cb052e6f066b7e2de0eca9c
parents d1dee579 947cfbda

core/java/android/bluetooth/le/ScanFilter.java

+9 −5
Original line number Diff line number Diff line
@@ -385,8 +385,12 @@ public final class ScanFilter implements Parcelable { 


    @Override

    public int hashCode() {

        return Objects.hash(mDeviceName, mDeviceAddress, mManufacturerId, mManufacturerData,

                mManufacturerDataMask, mServiceDataUuid, mServiceData, mServiceDataMask,

        return Objects.hash(mDeviceName, mDeviceAddress, mManufacturerId,

                            Arrays.hashCode(mManufacturerData),

                            Arrays.hashCode(mManufacturerDataMask),

                            mServiceDataUuid,

                            Arrays.hashCode(mServiceData),

                            Arrays.hashCode(mServiceDataMask),

                            mServiceUuid, mServiceUuidMask);

    }
@@ -404,7 +408,7 @@ public final class ScanFilter implements Parcelable { 
                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) &&