summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Greenwalt <rgreenwalt@google.com>2015-03-16 16:17:50 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-03-16 16:17:51 +0000
commit079cfa64ec827e80d3173e2043218866f1b36146 (patch)
treedfe3341b8c19dedbb8b6232c36267e6997f96406
parent5abcd06b1f673a2d59d1aba5f4b95fe741ace274 (diff)
parent34a7d13a65ab5734cd35c00863aa06ce54858ff0 (diff)
downloadframeworks_base-079cfa64ec827e80d3173e2043218866f1b36146.zip
frameworks_base-079cfa64ec827e80d3173e2043218866f1b36146.tar.gz
frameworks_base-079cfa64ec827e80d3173e2043218866f1b36146.tar.bz2
Merge "Frameworks/base: Fix a hashCode implementation"
-rw-r--r--wifi/java/android/net/wifi/p2p/nsd/WifiP2pServiceResponse.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/wifi/java/android/net/wifi/p2p/nsd/WifiP2pServiceResponse.java b/wifi/java/android/net/wifi/p2p/nsd/WifiP2pServiceResponse.java
index 194c982..0ddfa77 100644
--- a/wifi/java/android/net/wifi/p2p/nsd/WifiP2pServiceResponse.java
+++ b/wifi/java/android/net/wifi/p2p/nsd/WifiP2pServiceResponse.java
@@ -334,7 +334,7 @@ public class WifiP2pServiceResponse implements Parcelable {
result = 31 * result + mTransId;
result = 31 * result + (mDevice.deviceAddress == null ?
0 : mDevice.deviceAddress.hashCode());
- result = 31 * result + (mData == null ? 0 : mData.hashCode());
+ result = 31 * result + (mData == null ? 0 : Arrays.hashCode(mData));
return result;
}