Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Always enable bandwidth control in Q" am: 4be1419838

Browse Source 
am: e3621c5e2e

Change-Id: I8a7b78b7c71197eb5bdf54f0d52481303ea99b23
This commit is contained in:
Chenbo Feng
2018-09-06 21:10:14 -07:00
committed by android-build-merger
parent 254d818f88 e3621c5e2e
commit 827fa6e195
1 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
services/core/java/com/android/server/NetworkManagementService.java
View File

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