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

Commit 023bbf91 authored by Sudheer Shanka's avatar Sudheer Shanka Committed by Automerger Merge Worker
Browse files

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

Merge "Include reason in the logs when data saver state changes." into rvc-dev am: fd1d347f am: 1b7ea360

Change-Id: If77072875231f09b252cbeb9e7ad410cf45a4ab9
parents 8ec66474 1b7ea360

services/core/java/com/android/server/net/NetworkPolicyManagerService.java

+13 −6
Original line number Diff line number Diff line
@@ -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