diff options
| author | 2022-03-21 22:28:17 +0000 | |
|---|---|---|
| committer | 2022-03-21 22:28:17 +0000 | |
| commit | a725962d696d0f5aa4531b70325a852fd9ef3a05 (patch) | |
| tree | 0188478a3984223539ea1bdb7c22345455836adb | |
| parent | 9e478558190b4527773c431086a04417abd16cf6 (diff) | |
| parent | 82850c2c7521f0fcb384a58523fcc020f2b79d1f (diff) | |
Merge "Fix logs in NetworkPolicyManagerService." into tm-dev
| -rw-r--r-- | services/core/java/com/android/server/net/NetworkPolicyManagerService.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java index 0a34eedd47cb..c25e60864a68 100644 --- a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java +++ b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java @@ -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); |