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

Commit 29e72ea0 authored by Felipe Leme's avatar Felipe Leme
Browse files

Added trace on Data Saver-related methods. 

BUG: 31389946
Test: m -j32 cts && cts-tradefed run commandAndExit cts -m CtsHostsideNetworkTests -t com.android.cts.net.HostsideRestrictBackgroundNetworkTests

Change-Id: I4a4299371a529121438db166fe03de8263812323
parent 162d221b

services/core/java/com/android/server/NetworkManagementService.java

+7 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ import android.os.ServiceSpecificException; 
import android.os.StrictMode;

import android.os.SystemClock;

import android.os.SystemProperties;

import android.os.Trace;

import android.provider.Settings;

import android.telephony.DataConnectionRealTimeInfo;

import android.telephony.PhoneStateListener;
@@ -1699,6 +1700,7 @@ public class NetworkManagementService extends INetworkManagementService.Stub 
                return;

            }



            Trace.traceBegin(Trace.TRACE_TAG_NETWORK, "inetd bandwidth");

            try {

                mConnector.execute("bandwidth", suffix + chain, uid);

                if (enable) {
@@ -1708,6 +1710,8 @@ public class NetworkManagementService extends INetworkManagementService.Stub 
                }

            } catch (NativeDaemonConnectorException e) {

                throw e.rethrowAsParcelableException();

            } finally {

                Trace.traceEnd(Trace.TRACE_TAG_NETWORK);

            }

        }

    }
@@ -1730,6 +1734,7 @@ public class NetworkManagementService extends INetworkManagementService.Stub 
                Log.w(TAG, "setDataSaverMode(): already " + mDataSaverMode);

                return true;

            }

            Trace.traceBegin(Trace.TRACE_TAG_NETWORK, "bandwidthEnableDataSaver");

            try {

                final boolean changed = mNetdService.bandwidthEnableDataSaver(enable);

                if (changed) {
@@ -1741,6 +1746,8 @@ public class NetworkManagementService extends INetworkManagementService.Stub 
            } catch (RemoteException e) {

                Log.w(TAG, "setDataSaverMode(" + enable + "): netd command failed", e);

                return false;

            } finally {

                Trace.traceEnd(Trace.TRACE_TAG_NETWORK);

            }

        }

    }

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

+18 −13
Original line number Diff line number Diff line
@@ -2049,6 +2049,8 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { 


    @Override

    public void setRestrictBackground(boolean restrictBackground) {

        Trace.traceBegin(Trace.TRACE_TAG_NETWORK, "setRestrictBackground");

        try {

            mContext.enforceCallingOrSelfPermission(MANAGE_NETWORK_POLICY, TAG);

            final long token = Binder.clearCallingIdentity();

            try {
@@ -2068,6 +2070,9 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { 


            mHandler.obtainMessage(MSG_RESTRICT_BACKGROUND_CHANGED, restrictBackground ? 1 : 0, 0)

                    .sendToTarget();

        } finally {

            Trace.traceEnd(Trace.TRACE_TAG_NETWORK);

        }

    }



    private void setRestrictBackgroundUL(boolean restrictBackground) {