commit 4a622fb9299fe07e470e812f9838aed656e50965
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Apr 10 07:38:21 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 10 07:38:21 2018 +0000
tree 3e7502aa81aa8549bfbcf368d9f7b90dcd083206
parent aacd7eb67256735adaadd893569f54531e1b6dfd
parent 488df2dfa09768c99e93a8a6f8f47f45dcefb613

Merge "Trigger NetworkCallback events when private DNS usage has changed." into pi-dev

core/java/android/net/NetworkState.java

diff --git a/core/java/android/net/NetworkState.java b/core/java/android/net/NetworkState.java
index b00cb48..321f971 100644
--- a/core/java/android/net/NetworkState.java
+++ b/core/java/android/net/NetworkState.java
@@ -26,6 +26,8 @@
  * @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 @@
 
         // 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