| commit | 0bed99832a6df978575ef489f451f8275fe73ff7 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Dec 27 06:22:28 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Dec 27 06:22:28 2022 +0000 |
| tree | 4894b5ec690abaa59b40db8a83baff41e1c961ee | |
| parent | 4f0abecd31f366cc083ce14882f446fbcb33dfb5 [diff] | |
| parent | 37c4bac5dabb1f4f34f1085030eb96e592c5e0c4 [diff] |
Merge "Avoid NetworkPolicyLogger NullPointException" am: ffeb11af1c am: d5e8197824 am: 37c4bac5da Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2325095 Change-Id: I825e7f6d07942b8b516ddfebae95542d41ec3ac3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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,