Merge "Use java.util.Objects.hashCode to get hashcode."

2017-06-15 16:50:09 +00:00
parent 13ade8f910 26439f5616
commit 3890689bb2
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
@@ -22,6 +22,7 @@ import android.telephony.CellInfo;
 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 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 =