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

Commit 88c8c7bb authored by Sudheer Shanka's avatar Sudheer Shanka Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE in NetworkPolicyLogger.networkBlocked()."

parents 684a3c8f 9b986eba

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

+11 −3
Original line number Diff line number Diff line
@@ -15,12 +15,14 @@ 
 */

package com.android.server.net;



import static android.net.ConnectivityManager.BLOCKED_REASON_NONE;

import static android.net.INetd.FIREWALL_CHAIN_DOZABLE;

import static android.net.INetd.FIREWALL_CHAIN_POWERSAVE;

import static android.net.INetd.FIREWALL_CHAIN_RESTRICTED;

import static android.net.INetd.FIREWALL_CHAIN_STANDBY;

import static android.net.INetd.FIREWALL_RULE_ALLOW;

import static android.net.INetd.FIREWALL_RULE_DENY;

import static android.net.NetworkPolicyManager.ALLOWED_REASON_NONE;

import static android.net.NetworkPolicyManager.FIREWALL_CHAIN_NAME_DOZABLE;

import static android.net.NetworkPolicyManager.FIREWALL_CHAIN_NAME_POWERSAVE;

import static android.net.NetworkPolicyManager.FIREWALL_CHAIN_NAME_RESTRICTED;
@@ -29,6 +31,7 @@ import static android.net.NetworkPolicyManager.FIREWALL_RULE_DEFAULT; 
import static android.os.PowerExemptionManager.reasonCodeToString;

import static android.os.Process.INVALID_UID;



import android.annotation.Nullable;

import android.app.ActivityManager;

import android.app.ActivityManager.ProcessCapability;

import android.net.NetworkPolicyManager;
@@ -81,15 +84,20 @@ public class NetworkPolicyLogger { 


    private final Object mLock = new Object();



    void networkBlocked(int uid, UidBlockedState uidBlockedState) {

    void networkBlocked(int uid, @Nullable UidBlockedState uidBlockedState) {

        synchronized (mLock) {

            if (LOGD || uid == mDebugUid) {

                Slog.d(TAG, "Blocked state of uid: " + uidBlockedState.toString());

            }

            if (uidBlockedState == null) {

                mNetworkBlockedBuffer.networkBlocked(uid, BLOCKED_REASON_NONE, ALLOWED_REASON_NONE,

                        BLOCKED_REASON_NONE);

            } else {

                mNetworkBlockedBuffer.networkBlocked(uid, uidBlockedState.blockedReasons,

                        uidBlockedState.allowedReasons, uidBlockedState.effectiveBlockedReasons);

            }

        }

    }



    void uidStateChanged(int uid, int procState, long procStateSeq,

            @ProcessCapability int capability) {