commit d5e8197824ce648fa84ac1475736065aebad2993
author Treehugger Robot <treehugger-gerrit@google.com> Tue Dec 27 05:05:09 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Dec 27 05:05:09 2022 +0000
tree 37222042da39fe87bab7acdc52c8d040e7108d00
parent c05149b9461093ea6544170b19d70045d995f661
parent ffeb11af1c22a1b8e2af57aac338e1fb57261ec5

Merge "Avoid NetworkPolicyLogger NullPointException" am: ffeb11af1c

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

Change-Id: I1723cccec489ee4dfd400563fc9148520a458eaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

services/core/java/com/android/server/net/NetworkPolicyLogger.java

diff --git a/services/core/java/com/android/server/net/NetworkPolicyLogger.java b/services/core/java/com/android/server/net/NetworkPolicyLogger.java
index 4a0a07b..dc8fcb0 100644
--- a/services/core/java/com/android/server/net/NetworkPolicyLogger.java
+++ b/services/core/java/com/android/server/net/NetworkPolicyLogger.java
@@ -94,7 +94,7 @@
     void networkBlocked(int uid, @Nullable UidBlockedState uidBlockedState) {
         synchronized (mLock) {
             if (LOGD || uid == mDebugUid) {
-                Slog.d(TAG, "Blocked state of " + uid + ": " + uidBlockedState.toString());
+                Slog.d(TAG, "Blocked state of " + uid + ": " + uidBlockedState);
             }
             if (uidBlockedState == null) {
                 mNetworkBlockedBuffer.networkBlocked(uid, BLOCKED_REASON_NONE, ALLOWED_REASON_NONE,