diff options
| -rw-r--r-- | services/core/java/com/android/server/net/NetworkPolicyManagerService.java | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java index 173dfc244fe5..ec941c8aea59 100644 --- a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java +++ b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java @@ -800,7 +800,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { } enableFirewallChainUL(FIREWALL_CHAIN_STANDBY, true); - setRestrictBackgroundUL(mLoadedRestrictBackground); + setRestrictBackgroundUL(mLoadedRestrictBackground, "init_service"); updateRulesForGlobalChangeAL(false); updateNotificationsNL(); } @@ -2877,10 +2877,11 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { Trace.traceBegin(Trace.TRACE_TAG_NETWORK, "setRestrictBackground"); try { mContext.enforceCallingOrSelfPermission(MANAGE_NETWORK_POLICY, TAG); + final int callingUid = Binder.getCallingUid(); final long token = Binder.clearCallingIdentity(); try { synchronized (mUidRulesFirstLock) { - setRestrictBackgroundUL(restrictBackground); + setRestrictBackgroundUL(restrictBackground, "uid:" + callingUid); } } finally { Binder.restoreCallingIdentity(token); @@ -2891,7 +2892,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { } @GuardedBy("mUidRulesFirstLock") - private void setRestrictBackgroundUL(boolean restrictBackground) { + private void setRestrictBackgroundUL(boolean restrictBackground, String reason) { Trace.traceBegin(Trace.TRACE_TAG_NETWORK, "setRestrictBackgroundUL"); try { if (restrictBackground == mRestrictBackground) { @@ -2899,7 +2900,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { Slog.w(TAG, "setRestrictBackgroundUL: already " + restrictBackground); return; } - Slog.d(TAG, "setRestrictBackgroundUL(): " + restrictBackground); + Slog.d(TAG, "setRestrictBackgroundUL(): " + restrictBackground + "; reason: " + reason); final boolean oldRestrictBackground = mRestrictBackground; mRestrictBackground = restrictBackground; // Must whitelist foreground apps before turning data saver mode on. @@ -3425,7 +3426,13 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { fout.print("Restrict background: "); fout.println(mRestrictBackground); fout.print("Restrict power: "); fout.println(mRestrictPower); fout.print("Device idle: "); fout.println(mDeviceIdleMode); - fout.print("Metered ifaces: "); fout.println(String.valueOf(mMeteredIfaces)); + fout.print("Metered ifaces: "); fout.println(mMeteredIfaces); + + fout.println(); + fout.print("mRestrictBackgroundLowPowerMode: " + mRestrictBackgroundLowPowerMode); + fout.print("mRestrictBackgroundBeforeBsm: " + mRestrictBackgroundBeforeBsm); + fout.print("mLoadedRestrictBackground: " + mLoadedRestrictBackground); + fout.print("mRestrictBackgroundChangedInBsm: " + mRestrictBackgroundChangedInBsm); fout.println(); fout.println("Network policies:"); @@ -5020,7 +5027,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { } if (shouldInvokeRestrictBackground) { - setRestrictBackgroundUL(restrictBackground); + setRestrictBackgroundUL(restrictBackground, "low_power"); } // Change it at last so setRestrictBackground() won't affect this variable |