Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Avoid NetworkPolicyLogger NullPointException" am: ffeb11af1c am: d5e8197824

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

Change-Id: Ie5a7869d1fb7f3e0e938340887b5934b05325974
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2022-12-27 05:48:19 +00:00
committed by Automerger Merge Worker
parent 8bac1aee7f d5e8197824
commit 37c4bac5da
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/net/NetworkPolicyLogger.java
View File

@@ -94,7 +94,7 @@ public class NetworkPolicyLogger {
void networkBlocked(int uid, @Nullable UidBlockedState uidBlockedState) { void networkBlocked(int uid, @Nullable UidBlockedState uidBlockedState) {
synchronized (mLock) { synchronized (mLock) {
if (LOGD || uid == mDebugUid) { if (LOGD || uid == mDebugUid) {
Slog.d(TAG, "Blocked state of " + uid + ": " + uidBlockedState.toString()); Slog.d(TAG, "Blocked state of " + uid + ": " + uidBlockedState);
} }
if (uidBlockedState == null) { if (uidBlockedState == null) {
mNetworkBlockedBuffer.networkBlocked(uid, BLOCKED_REASON_NONE, ALLOWED_REASON_NONE, mNetworkBlockedBuffer.networkBlocked(uid, BLOCKED_REASON_NONE, ALLOWED_REASON_NONE,