diff options
author | Robert Greenwalt <rgreenwalt@google.com> | 2015-03-16 16:29:52 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-16 16:29:52 +0000 |
commit | 7cff91ea67f89ca963a822daa1b68674bfc0e587 (patch) | |
tree | 92144c3017ec0f76ed975cefd630ec506660863e | |
parent | 038b846284d666d94e8f52d7619ff26087165f73 (diff) | |
parent | 079cfa64ec827e80d3173e2043218866f1b36146 (diff) | |
download | frameworks_base-7cff91ea67f89ca963a822daa1b68674bfc0e587.zip frameworks_base-7cff91ea67f89ca963a822daa1b68674bfc0e587.tar.gz frameworks_base-7cff91ea67f89ca963a822daa1b68674bfc0e587.tar.bz2 |
am 079cfa64: Merge "Frameworks/base: Fix a hashCode implementation"
* commit '079cfa64ec827e80d3173e2043218866f1b36146':
Frameworks/base: Fix a hashCode implementation
-rw-r--r-- | wifi/java/android/net/wifi/p2p/nsd/WifiP2pServiceResponse.java | 2 |
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; } |