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

Commit 52bdd6cf authored by Junyu Lai's avatar Junyu Lai Committed by Automerger Merge Worker
Browse files

Merge "[BR12] Use sdk level instead of aconfig flag" into main am: 34e3f2c4 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2831370



Change-Id: Ib5423126dffa1972caa8b62736e238e8a4aab4fe
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9e725baf 34e3f2c4

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

+1 −2
Original line number 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.HexDump;

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.PermissionUtils;

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

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

            try {

                if (Flags.setDataSaverViaCm()) {

                if (SdkLevel.isAtLeastV()) {

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

                    mContext.getSystemService(ConnectivityManager.class)

                            .setDataSaverEnabled(enable);

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

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



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.Before;
@@ -264,7 +264,7 @@ public class NetworkManagementServiceTest { 
        verify(mCm).addUidToMeteredNetworkDenyList(TEST_UID);



        mNMService.setDataSaverModeEnabled(true);

        if (Flags.setDataSaverViaCm()) {

        if (SdkLevel.isAtLeastV()) {

            verify(mCm).setDataSaverEnabled(true);

        } else {

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

        verify(mCm).removeUidFromMeteredNetworkAllowList(TEST_UID);

        mNMService.setDataSaverModeEnabled(false);

        if (Flags.setDataSaverViaCm()) {

        if (SdkLevel.isAtLeastV()) {

            verify(mCm).setDataSaverEnabled(false);

        } else {

            verify(mNetdService).bandwidthEnableDataSaver(false);