commit 42355beeb93d4fc475eb1a0ba2b6bb0fa3041609
author Ian Rogers <irogers@google.com> Wed May 04 10:37:28 2016 -0700
committer Pavlin Radoslavov <pavlin@google.com> Wed May 04 17:16:49 2016 -0700
tree d0cbc2dc81424ecc0ae1dceea800e2b45b40e0a8
parent a02be1baff171bdf094ab03ff3748bd901161c00

Fix divergent equals and hashCode behavior

Calling Objects.hash with a byte[] will call the identity hashCode on the
byte[] (data, data_mask) and this doesn't agree with the use of
Objects.deepEquals in equals.
Bug caught by error prone.

Bug: 27723540
Change-Id: Ic33f9a341165db6c9339321f81f7af63d627a2cb

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

diff --git a/android/app/src/com/android/bluetooth/gatt/ScanFilterQueue.java b/android/app/src/com/android/bluetooth/gatt/ScanFilterQueue.java
index 4b47753..3dab4af 100644
--- a/android/app/src/com/android/bluetooth/gatt/ScanFilterQueue.java
+++ b/android/app/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