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>
This commit is contained in:
Treehugger Robot
2022-12-27 06:22:28 +00:00
committed by Automerger Merge Worker

View File

@@ -94,7 +94,7 @@ public class NetworkPolicyLogger {
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,