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

Commit 2ff5780d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 27c28f8d 2f463d4c

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) &&