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

Merge "Include reason in the logs when data saver state changes." into rvc-dev am: fd1d347f87 am: b8334cfaf6

Browse Source 
Change-Id: I678b12fd130c839aec15221737e02469cf7732f1
This commit is contained in:
Sudheer Shanka
2020-04-13 19:21:38 +00:00
committed by Automerger Merge Worker
parent a052e58be4 b8334cfaf6
commit c4f61abc24
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -800,7 +800,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
} }
enableFirewallChainUL(FIREWALL_CHAIN_STANDBY, true); enableFirewallChainUL(FIREWALL_CHAIN_STANDBY, true);
setRestrictBackgroundUL(mLoadedRestrictBackground); setRestrictBackgroundUL(mLoadedRestrictBackground, "init_service");
updateRulesForGlobalChangeAL(false); updateRulesForGlobalChangeAL(false);
updateNotificationsNL(); updateNotificationsNL();
} }
@@ -2877,10 +2877,11 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
Trace.traceBegin(Trace.TRACE_TAG_NETWORK, "setRestrictBackground"); Trace.traceBegin(Trace.TRACE_TAG_NETWORK, "setRestrictBackground");
try { try {
mContext.enforceCallingOrSelfPermission(MANAGE_NETWORK_POLICY, TAG); mContext.enforceCallingOrSelfPermission(MANAGE_NETWORK_POLICY, TAG);
final int callingUid = Binder.getCallingUid();
final long token = Binder.clearCallingIdentity(); final long token = Binder.clearCallingIdentity();
try { try {
synchronized (mUidRulesFirstLock) { synchronized (mUidRulesFirstLock) {
setRestrictBackgroundUL(restrictBackground); setRestrictBackgroundUL(restrictBackground, "uid:" + callingUid);
} }
} finally { } finally {
Binder.restoreCallingIdentity(token); Binder.restoreCallingIdentity(token);
@@ -2891,7 +2892,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
} }
@GuardedBy("mUidRulesFirstLock") @GuardedBy("mUidRulesFirstLock")
private void setRestrictBackgroundUL(boolean restrictBackground) { private void setRestrictBackgroundUL(boolean restrictBackground, String reason) {
Trace.traceBegin(Trace.TRACE_TAG_NETWORK, "setRestrictBackgroundUL"); Trace.traceBegin(Trace.TRACE_TAG_NETWORK, "setRestrictBackgroundUL");
try { try {
if (restrictBackground == mRestrictBackground) { if (restrictBackground == mRestrictBackground) {
@@ -2899,7 +2900,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
Slog.w(TAG, "setRestrictBackgroundUL: already " + restrictBackground); Slog.w(TAG, "setRestrictBackgroundUL: already " + restrictBackground);
return; return;
} }
Slog.d(TAG, "setRestrictBackgroundUL(): " + restrictBackground); Slog.d(TAG, "setRestrictBackgroundUL(): " + restrictBackground + "; reason: " + reason);
final boolean oldRestrictBackground = mRestrictBackground; final boolean oldRestrictBackground = mRestrictBackground;
mRestrictBackground = restrictBackground; mRestrictBackground = restrictBackground;
// Must whitelist foreground apps before turning data saver mode on. // 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 background: "); fout.println(mRestrictBackground);
fout.print("Restrict power: "); fout.println(mRestrictPower); fout.print("Restrict power: "); fout.println(mRestrictPower);
fout.print("Device idle: "); fout.println(mDeviceIdleMode); 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();
fout.println("Network policies:"); fout.println("Network policies:");
@@ -5020,7 +5027,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
} }
if (shouldInvokeRestrictBackground) { if (shouldInvokeRestrictBackground) {
setRestrictBackgroundUL(restrictBackground); setRestrictBackgroundUL(restrictBackground, "low_power");
} }
// Change it at last so setRestrictBackground() won't affect this variable // Change it at last so setRestrictBackground() won't affect this variable