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

Commit 7898c731 authored by Junyu Lai's avatar Junyu Lai
Browse files

[BR12] Use sdk level instead of aconfig flag 

This flag is also needed inside the mainline module.
Currently, there is no safe way to use aconfig flag in the module.
Thus, revert this check and use sdk level instead.

Test: atest FrameworksServicesTests:NetworkManagementServiceTest
Bug: 297836825
Change-Id: Ieec0a15cbe6cf3c65f765b18c66b45e4ec93670d
parent 7c18dd5b

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);