Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4862a628 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by android-build-merger
Browse files

Merge "Disable roaming sanity checking." into pi-dev 

am: 75f9459c

Change-Id: I93bb07583ef90fb8c31c5c9a0c3e2c6e4968f975
parents 1c0e63f2 75f9459c

core/java/android/net/NetworkState.java

+3 −1
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ import android.util.Slog; 
 * @hide

 */

public class NetworkState implements Parcelable {

    private static final boolean SANITY_CHECK_ROAMING = false;



    public static final NetworkState EMPTY = new NetworkState(null, null, null, null, null, null);



    public final NetworkInfo networkInfo;
@@ -47,7 +49,7 @@ public class NetworkState implements Parcelable { 


        // This object is an atomic view of a network, so the various components

        // should always agree on roaming state.

        if (networkInfo != null && networkCapabilities != null) {

        if (SANITY_CHECK_ROAMING && networkInfo != null && networkCapabilities != null) {

            if (networkInfo.isRoaming() == networkCapabilities

                    .hasCapability(NetworkCapabilities.NET_CAPABILITY_NOT_ROAMING)) {

                Slog.wtf("NetworkState", "Roaming state disagreement between " + networkInfo