summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2021-03-04 03:01:11 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-03-04 03:01:11 +0000
commita2611c00ca69fac6366aeaa2dbd56bbfc517657e (patch)
tree94d2cbac8d2af38f0ac3100b83c79c9c6ca1e363
parenteeb8bba5f4745b77a9c10d8e782300680e0bcddf (diff)
parentc0b0157d3ee340b91e992aa6fdddaf6076f290f0 (diff)
Merge "Use Log instead of Slog in QosCallbackAgentConnection" am: c0b0157d3e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614020 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0d5362567ab4c9f510582261ef365edfaabceaf5
-rw-r--r--services/core/java/com/android/server/connectivity/QosCallbackAgentConnection.java12
1 files changed, 4 insertions, 8 deletions
diff --git a/services/core/java/com/android/server/connectivity/QosCallbackAgentConnection.java b/services/core/java/com/android/server/connectivity/QosCallbackAgentConnection.java
index 816bf2be0d69..0f5400d0f8e6 100644
--- a/services/core/java/com/android/server/connectivity/QosCallbackAgentConnection.java
+++ b/services/core/java/com/android/server/connectivity/QosCallbackAgentConnection.java
@@ -27,7 +27,7 @@ import android.net.QosSession;
import android.os.IBinder;
import android.os.RemoteException;
import android.telephony.data.EpsBearerQosSessionAttributes;
-import android.util.Slog;
+import android.util.Log;
import java.util.Objects;
@@ -175,18 +175,14 @@ class QosCallbackAgentConnection implements IBinder.DeathRecipient {
}
private static void log(@NonNull final String msg) {
- Slog.d(TAG, msg);
+ Log.d(TAG, msg);
}
private static void logw(@NonNull final String msg) {
- Slog.w(TAG, msg);
+ Log.w(TAG, msg);
}
private static void loge(@NonNull final String msg, final Throwable t) {
- Slog.e(TAG, msg, t);
- }
-
- private static void logwtf(@NonNull final String msg) {
- Slog.wtf(TAG, msg);
+ Log.e(TAG, msg, t);
}
}