summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2021-03-12 05:15:42 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-03-12 05:15:42 +0000
commit2025545d5db0d0940cbc65b51c22a536408da15b (patch)
treeb556a8e06664c81fc03dea0ef3521a4969cadf41
parent75512d97f8e1997884729eab71a831b6af68c21e (diff)
parente95af44a65782fadc97c5389a92f426b3044e7ba (diff)
Merge "Remove Slog usage in NetworkState" am: e95af44a65
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1628360 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6e01b140db4d44de081ba4d87cca63578271500e
-rw-r--r--packages/Connectivity/framework/src/android/net/NetworkState.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/Connectivity/framework/src/android/net/NetworkState.java b/packages/Connectivity/framework/src/android/net/NetworkState.java
index d01026566ca0..9b69674728a8 100644
--- a/packages/Connectivity/framework/src/android/net/NetworkState.java
+++ b/packages/Connectivity/framework/src/android/net/NetworkState.java
@@ -22,7 +22,7 @@ import android.compat.annotation.UnsupportedAppUsage;
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 @@ public class NetworkState implements Parcelable {
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);
}
}