am 079cfa64: Merge "Frameworks/base: Fix a hashCode implementation"

* commit '079cfa64ec827e80d3173e2043218866f1b36146':
  Frameworks/base: Fix a hashCode implementation
This commit is contained in:
Robert Greenwalt
2015-03-16 16:29:52 +00:00
committed by Android Git Automerger

View File

@@ -334,7 +334,7 @@ public class WifiP2pServiceResponse implements Parcelable {
result = 31 * result + mTransId; result = 31 * result + mTransId;
result = 31 * result + (mDevice.deviceAddress == null ? result = 31 * result + (mDevice.deviceAddress == null ?
0 : mDevice.deviceAddress.hashCode()); 0 : mDevice.deviceAddress.hashCode());
result = 31 * result + (mData == null ? 0 : mData.hashCode()); result = 31 * result + (mData == null ? 0 : Arrays.hashCode(mData));
return result; return result;
} }