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

Commit 34e3f2c4 authored by Junyu Lai's avatar Junyu Lai Committed by Gerrit Code Review
Browse files

Merge "[BR12] Use sdk level instead of aconfig flag" into main

parents 22141cee 7898c731

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

+1 −2
Original line number Original line Diff line number Diff line
@@ -74,7 +74,6 @@ import com.android.internal.app.IBatteryStats; 
import com.android.internal.util.DumpUtils;

import com.android.internal.util.DumpUtils;

import com.android.internal.util.HexDump;

import com.android.internal.util.HexDump;

import com.android.modules.utils.build.SdkLevel;

import com.android.modules.utils.build.SdkLevel;

import com.android.net.flags.Flags;

import com.android.net.module.util.NetdUtils;

import com.android.net.module.util.NetdUtils;

import com.android.net.module.util.PermissionUtils;

import com.android.net.module.util.PermissionUtils;

import com.android.server.FgThread;

import com.android.server.FgThread;
@@ -1062,7 +1061,7 @@ public class NetworkManagementService extends INetworkManagementService.Stub { 
            }

            }

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

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

            try {

            try {

                if (Flags.setDataSaverViaCm()) {

                if (SdkLevel.isAtLeastV()) {

                    // setDataSaverEnabled throws if it fails to set data saver.

                    // setDataSaverEnabled throws if it fails to set data saver.

                    mContext.getSystemService(ConnectivityManager.class)

                    mContext.getSystemService(ConnectivityManager.class)

                            .setDataSaverEnabled(enable);

                            .setDataSaverEnabled(enable);

services/tests/servicestests/src/com/android/server/net/NetworkManagementServiceTest.java

+3 −3
Original line number Original line Diff line number Diff line
@@ -57,7 +57,7 @@ import android.util.ArrayMap; 
import androidx.test.runner.AndroidJUnit4;

import androidx.test.runner.AndroidJUnit4;





import com.android.internal.app.IBatteryStats;

import com.android.internal.app.IBatteryStats;

import com.android.net.flags.Flags;

import com.android.modules.utils.build.SdkLevel;





import org.junit.After;

import org.junit.After;

import org.junit.Before;

import org.junit.Before;
@@ -264,7 +264,7 @@ public class NetworkManagementServiceTest { 
        verify(mCm).addUidToMeteredNetworkDenyList(TEST_UID);

        verify(mCm).addUidToMeteredNetworkDenyList(TEST_UID);





        mNMService.setDataSaverModeEnabled(true);

        mNMService.setDataSaverModeEnabled(true);

        if (Flags.setDataSaverViaCm()) {

        if (SdkLevel.isAtLeastV()) {

            verify(mCm).setDataSaverEnabled(true);

            verify(mCm).setDataSaverEnabled(true);

        } else {

        } else {

            verify(mNetdService).bandwidthEnableDataSaver(true);

            verify(mNetdService).bandwidthEnableDataSaver(true);
@@ -284,7 +284,7 @@ public class NetworkManagementServiceTest { 
        mNMService.setUidOnMeteredNetworkAllowlist(TEST_UID, false);

        mNMService.setUidOnMeteredNetworkAllowlist(TEST_UID, false);

        verify(mCm).removeUidFromMeteredNetworkAllowList(TEST_UID);

        verify(mCm).removeUidFromMeteredNetworkAllowList(TEST_UID);

        mNMService.setDataSaverModeEnabled(false);

        mNMService.setDataSaverModeEnabled(false);

        if (Flags.setDataSaverViaCm()) {

        if (SdkLevel.isAtLeastV()) {

            verify(mCm).setDataSaverEnabled(false);

            verify(mCm).setDataSaverEnabled(false);

        } else {

        } else {

            verify(mNetdService).bandwidthEnableDataSaver(false);

            verify(mNetdService).bandwidthEnableDataSaver(false);