commit c4f797652cfd977293a24772f09c123af8ef2add
author Ying Xu <yinxu@google.com> Thu Jun 15 16:59:59 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jun 15 16:59:59 2017 +0000
tree 7f8c22393940fd4c3c6539761d4b37e35d38799a
parent 8c1e6e49f95ba6c588f87ef324eed98480fa9b8c
parent 3890689bb29543f8297f0b5bc9933739a4225daa

Merge "Use java.util.Objects.hashCode to get hashcode."
am: 3890689bb2

Change-Id: I07e33a09f7ed2af457d2ad6261b5469b9dfd15c2

telephony/java/com/android/internal/telephony/NetworkScanResult.java

diff --git a/telephony/java/com/android/internal/telephony/NetworkScanResult.java b/telephony/java/com/android/internal/telephony/NetworkScanResult.java
index 0099961..df80666 100644
--- a/telephony/java/com/android/internal/telephony/NetworkScanResult.java
+++ b/telephony/java/com/android/internal/telephony/NetworkScanResult.java
@@ -22,6 +22,7 @@
 import java.util.Arrays;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * Defines the incremental network scan result.
@@ -111,7 +112,7 @@
     public int hashCode () {
         return ((scanStatus * 31)
                 + (scanError * 23)
-                + (networkInfos.hashCode() * 37));
+                + (Objects.hashCode(networkInfos) * 37));
     }
 
     public static final Creator<NetworkScanResult> CREATOR =