Revert "API to adjust network stats."

core/java/android/net/INetworkStatsService.aidl

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

core/java/android/net/TrafficStats.java

@@ -88,13 +88,6 @@ public class TrafficStats {
      */
     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 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} */
     public static void closeQuietly(INetworkStatsSession session) {
         // TODO: move to NetworkStatsService once it exists

services/java/com/android/server/net/NetworkStatsService.java

@@ -695,14 +695,6 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
         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
      * interfaces. Used to associate {@link TelephonyManager#getSubscriberId()}