From 56a03a089d5bd0b3e40eafe5d220d9eabd77d5bf Mon Sep 17 00:00:00 2001 From: Luke Huang Date: Fri, 7 Sep 2018 12:02:16 +0800 Subject: [PATCH] Netd unconditionally enable bandwidth control Remove code which is used to enable bandwidth controller. Netd default enable it. Test: The bindwith control start correctly on new devices. Change-Id: I9498d2175104b31a6d37ea3ba6937c91c560d0a2 --- .../server/NetworkManagementService.java | 52 +++---------------- 1 file changed, 7 insertions(+), 45 deletions(-) diff --git a/services/core/java/com/android/server/NetworkManagementService.java b/services/core/java/com/android/server/NetworkManagementService.java index cdc1244108e97..c79cf7112109e 100644 --- a/services/core/java/com/android/server/NetworkManagementService.java +++ b/services/core/java/com/android/server/NetworkManagementService.java @@ -315,7 +315,6 @@ public class NetworkManagementService extends INetworkManagementService.Stub } private HashMap mActiveIdleTimers = Maps.newHashMap(); - private volatile boolean mBandwidthControlEnabled; private volatile boolean mFirewallEnabled; private volatile boolean mStrictEnabled; @@ -619,22 +618,11 @@ public class NetworkManagementService extends INetworkManagementService.Stub */ private void prepareNativeDaemon() { - mBandwidthControlEnabled = false; - // push any existing quota or UID rules synchronized (mQuotaLock) { - // 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"); + // Netd unconditionally enable bandwidth control + SystemProperties.set(PROP_QTAGUID_ENABLED, "1"); mStrictEnabled = true; @@ -716,11 +704,10 @@ public class NetworkManagementService extends INetworkManagementService.Stub } } - if (mBandwidthControlEnabled) { - try { - getBatteryStats().noteNetworkStatsEnabled(); - } catch (RemoteException e) { - } + + try { + getBatteryStats().noteNetworkStatsEnabled(); + } catch (RemoteException e) { } } @@ -1566,10 +1553,6 @@ public class NetworkManagementService extends INetworkManagementService.Stub public void setInterfaceQuota(String iface, long quotaBytes) { mContext.enforceCallingOrSelfPermission(CONNECTIVITY_INTERNAL, TAG); - // silently discard when control disabled - // TODO: eventually migrate to be always enabled - if (!mBandwidthControlEnabled) return; - synchronized (mQuotaLock) { if (mActiveQuotas.containsKey(iface)) { throw new IllegalStateException("iface " + iface + " already has quota"); @@ -1600,10 +1583,6 @@ public class NetworkManagementService extends INetworkManagementService.Stub public void removeInterfaceQuota(String iface) { mContext.enforceCallingOrSelfPermission(CONNECTIVITY_INTERNAL, TAG); - // silently discard when control disabled - // TODO: eventually migrate to be always enabled - if (!mBandwidthControlEnabled) return; - synchronized (mQuotaLock) { if (!mActiveQuotas.containsKey(iface)) { // TODO: eventually consider throwing @@ -1637,10 +1616,6 @@ public class NetworkManagementService extends INetworkManagementService.Stub public void setInterfaceAlert(String iface, long alertBytes) { mContext.enforceCallingOrSelfPermission(CONNECTIVITY_INTERNAL, TAG); - // silently discard when control disabled - // TODO: eventually migrate to be always enabled - if (!mBandwidthControlEnabled) return; - // quick sanity check if (!mActiveQuotas.containsKey(iface)) { throw new IllegalStateException("setting alert requires existing quota on iface"); @@ -1665,10 +1640,6 @@ public class NetworkManagementService extends INetworkManagementService.Stub public void removeInterfaceAlert(String iface) { mContext.enforceCallingOrSelfPermission(CONNECTIVITY_INTERNAL, TAG); - // silently discard when control disabled - // TODO: eventually migrate to be always enabled - if (!mBandwidthControlEnabled) return; - synchronized (mQuotaLock) { if (!mActiveAlerts.containsKey(iface)) { // TODO: eventually consider throwing @@ -1689,10 +1660,6 @@ public class NetworkManagementService extends INetworkManagementService.Stub public void setGlobalAlert(long alertBytes) { mContext.enforceCallingOrSelfPermission(CONNECTIVITY_INTERNAL, TAG); - // silently discard when control disabled - // TODO: eventually migrate to be always enabled - if (!mBandwidthControlEnabled) return; - try { mConnector.execute("bandwidth", "setglobalalert", alertBytes); } catch (NativeDaemonConnectorException e) { @@ -1703,10 +1670,6 @@ public class NetworkManagementService extends INetworkManagementService.Stub private void setUidOnMeteredNetworkList(int uid, boolean blacklist, boolean enable) { mContext.enforceCallingOrSelfPermission(CONNECTIVITY_INTERNAL, TAG); - // silently discard when control disabled - // TODO: eventually migrate to be always enabled - if (!mBandwidthControlEnabled) return; - final String chain = blacklist ? "naughtyapps" : "niceapps"; final String suffix = enable ? "add" : "remove"; @@ -1858,7 +1821,7 @@ public class NetworkManagementService extends INetworkManagementService.Stub @Override public boolean isBandwidthControlEnabled() { mContext.enforceCallingOrSelfPermission(CONNECTIVITY_INTERNAL, TAG); - return mBandwidthControlEnabled; + return true; } @Override @@ -2365,7 +2328,6 @@ public class NetworkManagementService extends INetworkManagementService.Stub mConnector.dump(fd, pw, args); pw.println(); - pw.print("Bandwidth control enabled: "); pw.println(mBandwidthControlEnabled); pw.print("mMobileActivityFromRadio="); pw.print(mMobileActivityFromRadio); pw.print(" mLastPowerStateFromRadio="); pw.println(mLastPowerStateFromRadio); pw.print("mNetworkActive="); pw.println(mNetworkActive);