LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jeff Sharkey
2018-04-09 23:57:28 +00:00
committed by Android (Google) Code Review
parent 534cfd2477 ab5f8652d3
commit aacd7eb672
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/net/NetworkState.java
View File

@@ -26,6 +26,8 @@ import android.util.Slog;
* @hide * @hide
*/ */
public class NetworkState implements Parcelable { 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 static final NetworkState EMPTY = new NetworkState(null, null, null, null, null, null);
public final NetworkInfo networkInfo; 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 // This object is an atomic view of a network, so the various components
// should always agree on roaming state. // should always agree on roaming state.
if (networkInfo != null && networkCapabilities != null) { if (SANITY_CHECK_ROAMING && networkInfo != null && networkCapabilities != null) {
if (networkInfo.isRoaming() == networkCapabilities if (networkInfo.isRoaming() == networkCapabilities
.hasCapability(NetworkCapabilities.NET_CAPABILITY_NOT_ROAMING)) { .hasCapability(NetworkCapabilities.NET_CAPABILITY_NOT_ROAMING)) {
Slog.wtf("NetworkState", "Roaming state disagreement between " + networkInfo Slog.wtf("NetworkState", "Roaming state disagreement between " + networkInfo