commit 15516e3f0bc507d7689f01edb32dad1e876ac1fd
author Treehugger Robot <treehugger-gerrit@google.com> Fri Mar 12 05:15:42 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Mar 12 05:15:42 2021 +0000
tree 8e0857ae66134bfc59e5814bcc1c049b1fa37714
parent 160a29cad8a2d03fbaa645ce37cc9297a62a5d7a
parent 437ee783c4c5f74d5fd8319665682d5bfe08c2cd

Merge "Remove Slog usage in NetworkState" am: 437ee783c4

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6e01b140db4d44de081ba4d87cca63578271500e

framework/src/android/net/NetworkState.java

diff --git a/framework/src/android/net/NetworkState.java b/framework/src/android/net/NetworkState.java
index d010265..9b69674 100644
--- a/framework/src/android/net/NetworkState.java
+++ b/framework/src/android/net/NetworkState.java
@@ -22,7 +22,7 @@
 import android.os.Build;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.util.Slog;
+import android.util.Log;
 
 /**
  * Snapshot of network state.
@@ -83,7 +83,7 @@
         if (VALIDATE_ROAMING_STATE && networkInfo != null && networkCapabilities != null) {
             if (networkInfo.isRoaming() == networkCapabilities
                     .hasCapability(NetworkCapabilities.NET_CAPABILITY_NOT_ROAMING)) {
-                Slog.wtf("NetworkState", "Roaming state disagreement between " + networkInfo
+                Log.wtf("NetworkState", "Roaming state disagreement between " + networkInfo
                         + " and " + networkCapabilities);
             }
         }