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

Commit a725962d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix logs in NetworkPolicyManagerService." into tm-dev

parents 9e478558 82850c2c

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);