LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NetworkStatsService: check kernel bandwidth support before enabling

Browse Source 
And catch the actual errors reported by the other side of NetworkManager.


Change-Id: I9a9393b659d6f896ee1bf40a8deaca7853ef8f94
Signed-off-by: JP Abgrall <jpa@google.com>
This commit is contained in:
JP Abgrall
2011-06-23 14:13:28 -07:00
parent 2e546ddbde
commit 27cb1fa96b
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/java/com/android/server/net/NetworkStatsService.java
View File

@@ -71,6 +71,7 @@ import android.util.Slog;
import android.util.TrustedTime; import android.util.TrustedTime;
import com.android.internal.os.AtomicFile; import com.android.internal.os.AtomicFile;
import com.android.server.NativeDaemonConnectorException;
import com.google.android.collect.Maps; import com.google.android.collect.Maps;
import com.google.android.collect.Sets; import com.google.android.collect.Sets;
@@ -214,7 +215,9 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
// TODO: consider shipping with this enabled by default // TODO: consider shipping with this enabled by default
mNetworkManager.setBandwidthControlEnabled(true); mNetworkManager.setBandwidthControlEnabled(true);
} catch (RemoteException e) { } catch (RemoteException e) {
Slog.e(TAG, "problem enabling bandwidth controls", e); Slog.e(TAG, "problem talking to netd while enabling bandwidth controls", e);
} catch (NativeDaemonConnectorException ndce) {
Slog.e(TAG, "problem enabling bandwidth controls", ndce);
} }
} else { } else {
Slog.w(TAG, "detailed network stats disabled"); Slog.w(TAG, "detailed network stats disabled");
@@ -1055,6 +1058,10 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
} }
public boolean getEnabled() { public boolean getEnabled() {
if (!new File("/proc/net/xt_qtaguid/ctrl").exists()) {
Slog.w(TAG, "kernel does not support bandwidth control");
return false;
}
return Settings.Secure.getInt(mResolver, NETSTATS_ENABLED, 1) != 0; return Settings.Secure.getInt(mResolver, NETSTATS_ENABLED, 1) != 0;
} }
public long getPollInterval() { public long getPollInterval() {