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

Merge "Fix NPE in NetworkPolicyLogger.networkBlocked()." am: 09de945c74 am: 22223c8c80 am: c907e083a9

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

Change-Id: Ifaf5f82b3aa882fd8eac4eda2f82f40b3e4fe629
This commit is contained in:
Sudheer Shanka
2022-02-08 22:53:48 +00:00
committed by Automerger Merge Worker
parent 4074cafa69 c907e083a9
commit 9e674f283d
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,12 +15,14 @@
*/ */
package com.android.server.net; 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_DOZABLE;
import static android.net.INetd.FIREWALL_CHAIN_POWERSAVE; import static android.net.INetd.FIREWALL_CHAIN_POWERSAVE;
import static android.net.INetd.FIREWALL_CHAIN_RESTRICTED; import static android.net.INetd.FIREWALL_CHAIN_RESTRICTED;
import static android.net.INetd.FIREWALL_CHAIN_STANDBY; import static android.net.INetd.FIREWALL_CHAIN_STANDBY;
import static android.net.INetd.FIREWALL_RULE_ALLOW; import static android.net.INetd.FIREWALL_RULE_ALLOW;
import static android.net.INetd.FIREWALL_RULE_DENY; 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_DOZABLE;
import static android.net.NetworkPolicyManager.FIREWALL_CHAIN_NAME_POWERSAVE; import static android.net.NetworkPolicyManager.FIREWALL_CHAIN_NAME_POWERSAVE;
import static android.net.NetworkPolicyManager.FIREWALL_CHAIN_NAME_RESTRICTED; 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.PowerExemptionManager.reasonCodeToString;
import static android.os.Process.INVALID_UID; import static android.os.Process.INVALID_UID;
import android.annotation.Nullable;
import android.app.ActivityManager; import android.app.ActivityManager;
import android.app.ActivityManager.ProcessCapability; import android.app.ActivityManager.ProcessCapability;
import android.net.NetworkPolicyManager; import android.net.NetworkPolicyManager;
@@ -81,13 +84,18 @@ public class NetworkPolicyLogger {
private final Object mLock = new Object(); private final Object mLock = new Object();
void networkBlocked(int uid, 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.toString());
} }
mNetworkBlockedBuffer.networkBlocked(uid, uidBlockedState.blockedReasons, if (uidBlockedState == null) {
uidBlockedState.allowedReasons, uidBlockedState.effectiveBlockedReasons); mNetworkBlockedBuffer.networkBlocked(uid, BLOCKED_REASON_NONE, ALLOWED_REASON_NONE,
BLOCKED_REASON_NONE);
} else {
mNetworkBlockedBuffer.networkBlocked(uid, uidBlockedState.blockedReasons,
uidBlockedState.allowedReasons, uidBlockedState.effectiveBlockedReasons);
}
} }
} }