commit ff5480575ebcc670635ec0672ea9082bc8372ab2
author Treehugger Robot <treehugger-gerrit@google.com> Fri Mar 12 06:13:59 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Mar 12 06:13:59 2021 +0000
tree 7cd0fc01a1cccd42ec3c888dd0703a704b295d6a
parent 6ce9aa2d4941b83381c58df31bed0edbf80a851d
parent fc8d0f981f044afa576e3b7adb1896180ee6e6ec

Merge "Remove Slog usage in NetworkState" am: 437ee783c4 am: 15516e3f0b am: fc8d0f981f

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0345579ab38ffd06dc548d7c268f1e2dff2c7b9d

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);
             }
         }