Merge "Always enable bandwidth control in Q" am: 4be1419838 (827fa6e1) · Commits · e / os / android_frameworks_base

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

+8 −13

Original line number	Diff line number	Diff line
		@@ -621,13 +621,11 @@ 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) {
		// 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");
		@@ -635,9 +633,6 @@ public class NetworkManagementService extends INetworkManagementService.Stub
		} catch (NativeDaemonConnectorException e) {
		Log.wtf(TAG, "problem enabling bandwidth controls", e);
		}
		} else {
		Slog.i(TAG, "not enabling bandwidth control");
		}

		SystemProperties.set(PROP_QTAGUID_ENABLED, mBandwidthControlEnabled ? "1" : "0");