commit d5d2903307d7a1c8bfd04bf5e3d5c6d97462532b
author Ying Xu <yinxu@google.com> Thu Jun 15 20:09:07 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jun 15 20:09:07 2017 +0000
tree 816b918fe037a89e6d7e01476cd8307a0b4a8a94
parent 4aa97fc104783c75eff4b0f5af14b4d57f781445
parent 7682ce607629d9c52ed1bb44947c7b8c8ca3db83

Merge "Use java.util.Objects.hashCode to get hashcode." am: 3890689bb2 am: c4f797652c am: ce80092aaf
am: 7682ce6076

Change-Id: I4a11cb67000324f9755c3cb6ab1d15dd6e23238b

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 2f0fdba..7a7c174 100644
--- a/telephony/java/com/android/internal/telephony/NetworkScanResult.java
+++ b/telephony/java/com/android/internal/telephony/NetworkScanResult.java
@@ -21,6 +21,7 @@
 import android.telephony.CellInfo;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * Defines the incremental network scan result.
@@ -108,7 +109,7 @@
     public int hashCode () {
         return ((scanStatus * 31)
                 + (scanError * 23)
-                + (networkInfos.hashCode() * 37));
+                + (Objects.hashCode(networkInfos) * 37));
     }
 
     public static final Creator<NetworkScanResult> CREATOR =