From 52f1e6f663606a5fb02eeeeb82a6c3b26ff0c0f2 Mon Sep 17 00:00:00 2001 From: Chenbo Feng Date: Tue, 12 Dec 2017 10:38:48 -0800 Subject: [PATCH] Always enable bandwidth control in Q The current bindwith control check the qtaguid module before start. But since the bandwidth controlling feature is tested by CTS already, all devices should have either xt_qtaguid or proper eBPF program to support that by default. So just delete the checking code and always try to turn it on when device start Bug: 30950746 Test: The bindwith control start correctly on new devices. Change-Id: I4cc5ebfbcf89181fcdba3a2711b637722e56ce73 --- .../server/NetworkManagementService.java | 21 +++++++------------ 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/services/core/java/com/android/server/NetworkManagementService.java b/services/core/java/com/android/server/NetworkManagementService.java index bd0a4c7bb1c89..cdc1244108e97 100644 --- a/services/core/java/com/android/server/NetworkManagementService.java +++ b/services/core/java/com/android/server/NetworkManagementService.java @@ -621,22 +621,17 @@ public class NetworkManagementService extends INetworkManagementService.Stub mBandwidthControlEnabled = false; - // only enable bandwidth control when support exists - final boolean hasKernelSupport = new File("/proc/net/xt_qtaguid/ctrl").exists(); - // push any existing quota or UID rules synchronized (mQuotaLock) { - if (hasKernelSupport) { - Slog.d(TAG, "enabling bandwidth control"); - try { - mConnector.execute("bandwidth", "enable"); - mBandwidthControlEnabled = true; - } catch (NativeDaemonConnectorException e) { - Log.wtf(TAG, "problem enabling bandwidth controls", e); - } - } else { - Slog.i(TAG, "not enabling bandwidth control"); + // TODO: Delete this code and have netd unconditionally enable bandwidth control at + // startup time + Slog.d(TAG, "enabling bandwidth control"); + try { + mConnector.execute("bandwidth", "enable"); + mBandwidthControlEnabled = true; + } catch (NativeDaemonConnectorException e) { + Log.wtf(TAG, "problem enabling bandwidth controls", e); } SystemProperties.set(PROP_QTAGUID_ENABLED, mBandwidthControlEnabled ? "1" : "0");