Merge "Use java.util.Objects.hashCode to get hashcode." into oc-dr1-dev

2017-06-22 23:19:57 +00:00
parent 424e517d5d f0b2b823c0
commit 9523a12b95
1 changed files with 2 additions and 1 deletions
--- a/telephony/java/com/android/internal/telephony/NetworkScanResult.java
+++ b/telephony/java/com/android/internal/telephony/NetworkScanResult.java
@@ -21,6 +21,7 @@ import android.os.Parcelable;
 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 final class NetworkScanResult implements Parcelable {
    public int hashCode () {
        return ((scanStatus * 31)
                + (scanError * 23)
-                + (networkInfos.hashCode() * 37));
+                + (Objects.hashCode(networkInfos) * 37));
    }

    public static final Creator<NetworkScanResult> CREATOR =