Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 37c4bac5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Avoid NetworkPolicyLogger NullPointException" am: ffeb11af am: d5e81978 

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



Change-Id: Ie5a7869d1fb7f3e0e938340887b5934b05325974
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8bac1aee d5e81978

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

+1 −1
Original line number Diff line number Diff line
@@ -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,