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

Better assertions when bandwidth module disabled.

Browse Source 
Also disable some verbose logging in WifiStateTracker.

Bug: 6368329
Change-Id: I9a5219bc1b3fd870468f7de46cdf4f173a437c59
This commit is contained in:
Jeff Sharkey
2012-04-21 15:36:48 -07:00
parent 52fc83a79a
commit 32c773b16a
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -420,6 +420,7 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
@Override @Override
public INetworkStatsSession openSession() { public INetworkStatsSession openSession() {
mContext.enforceCallingOrSelfPermission(READ_NETWORK_USAGE_HISTORY, TAG); mContext.enforceCallingOrSelfPermission(READ_NETWORK_USAGE_HISTORY, TAG);
assertBandwidthControlEnabled();
// return an IBinder which holds strong references to any loaded stats // return an IBinder which holds strong references to any loaded stats
// for its lifetime; when caller closes only weak references remain. // for its lifetime; when caller closes only weak references remain.
@@ -486,6 +487,7 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
@Override @Override
public long getNetworkTotalBytes(NetworkTemplate template, long start, long end) { public long getNetworkTotalBytes(NetworkTemplate template, long start, long end) {
mContext.enforceCallingOrSelfPermission(READ_NETWORK_USAGE_HISTORY, TAG); mContext.enforceCallingOrSelfPermission(READ_NETWORK_USAGE_HISTORY, TAG);
assertBandwidthControlEnabled();
return mDevStatsCached.getSummary(template, start, end).getTotalBytes(); return mDevStatsCached.getSummary(template, start, end).getTotalBytes();
} }
@@ -494,6 +496,7 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
if (Binder.getCallingUid() != uid) { if (Binder.getCallingUid() != uid) {
mContext.enforceCallingOrSelfPermission(ACCESS_NETWORK_STATE, TAG); mContext.enforceCallingOrSelfPermission(ACCESS_NETWORK_STATE, TAG);
} }
assertBandwidthControlEnabled();
// TODO: switch to data layer stats once kernel exports // TODO: switch to data layer stats once kernel exports
// for now, read network layer stats and flatten across all ifaces // for now, read network layer stats and flatten across all ifaces
@@ -565,6 +568,7 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
@Override @Override
public void forceUpdate() { public void forceUpdate() {
mContext.enforceCallingOrSelfPermission(READ_NETWORK_USAGE_HISTORY, TAG); mContext.enforceCallingOrSelfPermission(READ_NETWORK_USAGE_HISTORY, TAG);
assertBandwidthControlEnabled();
final long token = Binder.clearCallingIdentity(); final long token = Binder.clearCallingIdentity();
try { try {
@@ -1039,6 +1043,12 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
} }
}; };
private void assertBandwidthControlEnabled() {
if (!isBandwidthControlEnabled()) {
throw new IllegalStateException("Bandwidth module disabled");
}
}
private boolean isBandwidthControlEnabled() { private boolean isBandwidthControlEnabled() {
try { try {
return mNetworkManager.isBandwidthControlEnabled(); return mNetworkManager.isBandwidthControlEnabled();