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

Fix logs in NetworkPolicyManagerService. am: fa63f4448e am: 745fbfce8a

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

Change-Id: I60c169c64d273943ddc8bf9f26b37ef34bb7e7bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Sudheer Shanka
2022-04-15 18:36:43 +00:00
committed by Automerger Merge Worker
parent 63966a3d6a 745fbfce8a
commit 9e09070091
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/net/NetworkPolicyManagerService.java
View File

@@ -5468,11 +5468,11 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
if (LOGV) Slog.v(TAG, "setMeteredNetworkDenylist " + uid + ": " + enable); if (LOGV) Slog.v(TAG, "setMeteredNetworkDenylist " + uid + ": " + enable);
try { try {
mNetworkManager.setUidOnMeteredNetworkDenylist(uid, enable); mNetworkManager.setUidOnMeteredNetworkDenylist(uid, enable);
mLogger.meteredAllowlistChanged(uid, enable); mLogger.meteredDenylistChanged(uid, enable);
if (Process.isApplicationUid(uid)) { if (Process.isApplicationUid(uid)) {
final int sdkSandboxUid = Process.toSdkSandboxUid(uid); final int sdkSandboxUid = Process.toSdkSandboxUid(uid);
mNetworkManager.setUidOnMeteredNetworkDenylist(sdkSandboxUid, enable); mNetworkManager.setUidOnMeteredNetworkDenylist(sdkSandboxUid, enable);
mLogger.meteredAllowlistChanged(sdkSandboxUid, enable); mLogger.meteredDenylistChanged(sdkSandboxUid, enable);
} }
} catch (IllegalStateException e) { } catch (IllegalStateException e) {
Log.wtf(TAG, "problem setting denylist (" + enable + ") rules for " + uid, e); Log.wtf(TAG, "problem setting denylist (" + enable + ") rules for " + uid, e);
@@ -5485,11 +5485,11 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
if (LOGV) Slog.v(TAG, "setMeteredNetworkAllowlist " + uid + ": " + enable); if (LOGV) Slog.v(TAG, "setMeteredNetworkAllowlist " + uid + ": " + enable);
try { try {
mNetworkManager.setUidOnMeteredNetworkAllowlist(uid, enable); mNetworkManager.setUidOnMeteredNetworkAllowlist(uid, enable);
mLogger.meteredDenylistChanged(uid, enable); mLogger.meteredAllowlistChanged(uid, enable);
if (Process.isApplicationUid(uid)) { if (Process.isApplicationUid(uid)) {
final int sdkSandboxUid = Process.toSdkSandboxUid(uid); final int sdkSandboxUid = Process.toSdkSandboxUid(uid);
mNetworkManager.setUidOnMeteredNetworkAllowlist(sdkSandboxUid, enable); mNetworkManager.setUidOnMeteredNetworkAllowlist(sdkSandboxUid, enable);
mLogger.meteredDenylistChanged(sdkSandboxUid, enable); mLogger.meteredAllowlistChanged(sdkSandboxUid, enable);
} }
} catch (IllegalStateException e) { } catch (IllegalStateException e) {
Log.wtf(TAG, "problem setting allowlist (" + enable + ") rules for " + uid, e); Log.wtf(TAG, "problem setting allowlist (" + enable + ") rules for " + uid, e);