commit 25c9b7e2a486df02b462d2b89b674c5098c89e60
author Ian Rogers <irogers@google.com> Thu May 05 04:43:15 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu May 05 04:43:15 2016 +0000
tree def69fa209df4cb7064e8cce7781079c0746d143
parent 1e56607e2310341b96512bacb4e7258d44cbc9fa
parent 953bc530a3d16c5e73e95b0abacc56deb241996b

Merge "Fix divergent equals and hashCode behavior" am: c19deeb758
am: 953bc530a3

* commit '953bc530a3d16c5e73e95b0abacc56deb241996b':
  Fix divergent equals and hashCode behavior

Change-Id: I8e40f7cd8db56d007e1a7f61f1a0f52e56116922

src/com/android/bluetooth/gatt/ScanFilterQueue.java

diff --git a/src/com/android/bluetooth/gatt/ScanFilterQueue.java b/src/com/android/bluetooth/gatt/ScanFilterQueue.java
index 4b47753..3dab4af 100644
--- a/src/com/android/bluetooth/gatt/ScanFilterQueue.java
+++ b/src/com/android/bluetooth/gatt/ScanFilterQueue.java
@@ -61,8 +61,10 @@
 
         @Override
         public int hashCode() {
-            return Objects.hash(address, addr_type, type, uuid, uuid_mask, name, company,
-                    company_mask, data, data_mask);
+            return Objects.hash(address, addr_type, type, uuid, uuid_mask,
+                                name, company, company_mask,
+                                Arrays.hashCode(data),
+                                Arrays.hashCode(data_mask));
         }
 
         @Override