diff options
| -rw-r--r-- | services/core/java/com/android/server/net/NetworkManagementService.java | 23 | ||||
| -rw-r--r-- | services/tests/servicestests/src/com/android/server/net/NetworkManagementServiceTest.java | 13 |
2 files changed, 9 insertions, 27 deletions
diff --git a/services/core/java/com/android/server/net/NetworkManagementService.java b/services/core/java/com/android/server/net/NetworkManagementService.java index c3b09235c49d..36adea7e0112 100644 --- a/services/core/java/com/android/server/net/NetworkManagementService.java +++ b/services/core/java/com/android/server/net/NetworkManagementService.java @@ -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.NetdUtils.ModifyOperation; import com.android.net.module.util.PermissionUtils; @@ -1073,25 +1072,17 @@ public class NetworkManagementService extends INetworkManagementService.Stub { Log.w(TAG, "setDataSaverMode(): already " + mDataSaverMode); return true; } - Trace.traceBegin(Trace.TRACE_TAG_NETWORK, "setDataSaverModeEnabled"); + Trace.traceBegin(Trace.TRACE_TAG_NETWORK, "bandwidthEnableDataSaver"); try { - if (Flags.setDataSaverViaCm()) { - // setDataSaverEnabled throws if it fails to set data saver. - mContext.getSystemService(ConnectivityManager.class) - .setDataSaverEnabled(enable); + final boolean changed = mNetdService.bandwidthEnableDataSaver(enable); + if (changed) { mDataSaverMode = enable; - return true; } else { - final boolean changed = mNetdService.bandwidthEnableDataSaver(enable); - if (changed) { - mDataSaverMode = enable; - } else { - Log.e(TAG, "setDataSaverMode(" + enable + "): failed to set iptables"); - } - return changed; + Log.w(TAG, "setDataSaverMode(" + enable + "): netd command silently failed"); } - } catch (RemoteException | IllegalStateException e) { - Log.e(TAG, "setDataSaverMode(" + enable + "): failed with exception", e); + return changed; + } catch (RemoteException e) { + Log.w(TAG, "setDataSaverMode(" + enable + "): netd command failed", e); return false; } finally { Trace.traceEnd(Trace.TRACE_TAG_NETWORK); diff --git a/services/tests/servicestests/src/com/android/server/net/NetworkManagementServiceTest.java b/services/tests/servicestests/src/com/android/server/net/NetworkManagementServiceTest.java index 2cdfbffda407..af144cf49a46 100644 --- a/services/tests/servicestests/src/com/android/server/net/NetworkManagementServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/net/NetworkManagementServiceTest.java @@ -57,7 +57,6 @@ import android.util.ArrayMap; import androidx.test.runner.AndroidJUnit4; import com.android.internal.app.IBatteryStats; -import com.android.net.flags.Flags; import org.junit.After; import org.junit.Before; @@ -264,11 +263,7 @@ public class NetworkManagementServiceTest { verify(mCm).addUidToMeteredNetworkDenyList(TEST_UID); mNMService.setDataSaverModeEnabled(true); - if (Flags.setDataSaverViaCm()) { - verify(mCm).setDataSaverEnabled(true); - } else { - verify(mNetdService).bandwidthEnableDataSaver(true); - } + verify(mNetdService).bandwidthEnableDataSaver(true); mNMService.setUidOnMeteredNetworkDenylist(TEST_UID, false); assertTrue("Should be true since data saver is on and the uid is not allowlisted", @@ -284,11 +279,7 @@ public class NetworkManagementServiceTest { mNMService.setUidOnMeteredNetworkAllowlist(TEST_UID, false); verify(mCm).removeUidFromMeteredNetworkAllowList(TEST_UID); mNMService.setDataSaverModeEnabled(false); - if (Flags.setDataSaverViaCm()) { - verify(mCm).setDataSaverEnabled(false); - } else { - verify(mNetdService).bandwidthEnableDataSaver(false); - } + verify(mNetdService).bandwidthEnableDataSaver(false); assertFalse("Network should not be restricted when data saver is off", mNMService.isNetworkRestricted(TEST_UID)); } |