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

am 12afb1cf: am e1cf73eb: Revert "API to adjust network stats."

Browse Source 
* commit '12afb1cfcc3a66189f8ecf83573a7ed7df63343e':
  Revert "API to adjust network stats."
This commit is contained in:
Jeff Sharkey
2012-07-31 17:23:00 -07:00
committed by Android Git Automerger
parent e29c9c4a5e 12afb1cfcc
commit 651f772f4f
3 changed files with 0 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/net/INetworkStatsService.aidl
View File

@@ -45,7 +45,4 @@ interface INetworkStatsService {
/** Advise persistance threshold; may be overridden internally. */ /** Advise persistance threshold; may be overridden internally. */
void advisePersistThreshold(long thresholdBytes); void advisePersistThreshold(long thresholdBytes);
/** Adjust recorded network stats. */
void adjustNetworkStats(int uid, int tag, long rxBytes, long rxPackets, long txBytes, long txPackets, long operationCount);
} }

28
core/java/android/net/TrafficStats.java
View File

@@ -88,13 +88,6 @@ public class TrafficStats {
*/ */
public static final int TAG_SYSTEM_BACKUP = 0xFFFFFF03; public static final int TAG_SYSTEM_BACKUP = 0xFFFFFF03;
/**
* Default tag value for cloud messaging traffic.
*
* @hide
*/
public static final int TAG_SYSTEM_CLOUD_MESSAGING = 0xFFFFFF04;
private static INetworkStatsService sStatsService; private static INetworkStatsService sStatsService;
private synchronized static INetworkStatsService getStatsService() { private synchronized static INetworkStatsService getStatsService() {
@@ -253,27 +246,6 @@ public class TrafficStats {
} }
} }
/**
* Adjust network statistics for the given UID and tag by the requested
* amount. This can be used to correctly account network usage performed on
* behalf of another application. Values can be negative.
* <p>
* Requires that caller holds
* {@link android.Manifest.permission#MODIFY_NETWORK_ACCOUNTING} permission.
*
* @see #setThreadStatsUid(int)
* @hide
*/
public static void adjustNetworkStats(int uid, int tag, long rxBytes, long rxPackets,
long txBytes, long txPackets, long operationCount) {
try {
getStatsService().adjustNetworkStats(
uid, tag, rxBytes, rxPackets, txBytes, txPackets, operationCount);
} catch (RemoteException e) {
throw new RuntimeException(e);
}
}
/** {@hide} */ /** {@hide} */
public static void closeQuietly(INetworkStatsSession session) { public static void closeQuietly(INetworkStatsSession session) {
// TODO: move to NetworkStatsService once it exists // TODO: move to NetworkStatsService once it exists

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

@@ -695,14 +695,6 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
mGlobalAlertBytes = mSettings.getGlobalAlertBytes(mPersistThreshold); mGlobalAlertBytes = mSettings.getGlobalAlertBytes(mPersistThreshold);
} }
@Override
public void adjustNetworkStats(int uid, int tag, long rxBytes, long rxPackets, long txBytes,
long txPackets, long operationCount) {
mContext.enforceCallingOrSelfPermission(MODIFY_NETWORK_ACCOUNTING, TAG);
// TODO: store adjusted network stats in separate data structure
}
/** /**
* Receiver that watches for {@link IConnectivityManager} to claim network * Receiver that watches for {@link IConnectivityManager} to claim network
* interfaces. Used to associate {@link TelephonyManager#getSubscriberId()} * interfaces. Used to associate {@link TelephonyManager#getSubscriberId()}