summaryrefslogtreecommitdiffstats
path: root/wifi/java
diff options
context:
space:
mode:
authorRobert Greenwalt <rgreenwalt@google.com>2015-03-16 16:48:46 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-16 16:48:46 +0000
commit88dadfaa3be35e5d49c3424398f3244b187b6ed5 (patch)
treea4e7d14604e9a3453dad337c7af7a7a151d83901 /wifi/java
parent1109006158630c02784a8cf93675c0e14722c27b (diff)
parent7cff91ea67f89ca963a822daa1b68674bfc0e587 (diff)
downloadframeworks_base-88dadfaa3be35e5d49c3424398f3244b187b6ed5.zip
frameworks_base-88dadfaa3be35e5d49c3424398f3244b187b6ed5.tar.gz
frameworks_base-88dadfaa3be35e5d49c3424398f3244b187b6ed5.tar.bz2
am 7cff91ea: am 079cfa64: Merge "Frameworks/base: Fix a hashCode implementation"
* commit '7cff91ea67f89ca963a822daa1b68674bfc0e587': Frameworks/base: Fix a hashCode implementation
Diffstat (limited to 'wifi/java')
-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;
}