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

Commit a860bc25 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove Slog usage in NetworkState" am: e95af44a am: 2025545d am: 1c38988a 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1628360

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0345579ab38ffd06dc548d7c268f1e2dff2c7b9d
parents f6fdef09 1c38988a

packages/Connectivity/framework/src/android/net/NetworkState.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -22,7 +22,7 @@ import android.compat.annotation.UnsupportedAppUsage; 
import android.os.Build;

import android.os.Build;

import android.os.Parcel;

import android.os.Parcel;

import android.os.Parcelable;

import android.os.Parcelable;

import android.util.Slog;

import android.util.Log;





/**

/**

 * Snapshot of network state.

 * Snapshot of network state.
@@ -83,7 +83,7 @@ public class NetworkState implements Parcelable { 
        if (VALIDATE_ROAMING_STATE && networkInfo != null && networkCapabilities != null) {

        if (VALIDATE_ROAMING_STATE && 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

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

                        + " and " + networkCapabilities);

                        + " and " + networkCapabilities);

            }

            }

        }

        }