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

Commit ad6638a1 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix logs in NetworkPolicyManagerService." into tm-dev am: a725962d 

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

Change-Id: Iff44007c91e6f37ed9cec0636ac9376e64771880
parents efc94e18 a725962d

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

+4 −4
Original line number Diff line number Diff line
@@ -5451,11 +5451,11 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { 
        if (LOGV) Slog.v(TAG, "setMeteredNetworkDenylist " + uid + ": " + enable);

        try {

            mNetworkManager.setUidOnMeteredNetworkDenylist(uid, enable);

            mLogger.meteredAllowlistChanged(uid, enable);

            mLogger.meteredDenylistChanged(uid, enable);

            if (Process.isApplicationUid(uid)) {

                final int sdkSandboxUid = Process.toSdkSandboxUid(uid);

                mNetworkManager.setUidOnMeteredNetworkDenylist(sdkSandboxUid, enable);

                mLogger.meteredAllowlistChanged(sdkSandboxUid, enable);

                mLogger.meteredDenylistChanged(sdkSandboxUid, enable);

            }

        } catch (IllegalStateException e) {

            Log.wtf(TAG, "problem setting denylist (" + enable + ") rules for " + uid, e);
@@ -5468,11 +5468,11 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { 
        if (LOGV) Slog.v(TAG, "setMeteredNetworkAllowlist " + uid + ": " + enable);

        try {

            mNetworkManager.setUidOnMeteredNetworkAllowlist(uid, enable);

            mLogger.meteredDenylistChanged(uid, enable);

            mLogger.meteredAllowlistChanged(uid, enable);

            if (Process.isApplicationUid(uid)) {

                final int sdkSandboxUid = Process.toSdkSandboxUid(uid);

                mNetworkManager.setUidOnMeteredNetworkAllowlist(sdkSandboxUid, enable);

                mLogger.meteredDenylistChanged(sdkSandboxUid, enable);

                mLogger.meteredAllowlistChanged(sdkSandboxUid, enable);

            }

        } catch (IllegalStateException e) {

            Log.wtf(TAG, "problem setting allowlist (" + enable + ") rules for " + uid, e);