Merge "Splice operations before collapsing ifaces." (4b3c5232) · Commits · e / os / android_frameworks_base

core/java/android/net/NetworkStats.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -352,10 +352,9 @@ public class NetworkStats implements Parcelable {
		* on matching {@link #uid} and {@link #tag} rows. Ignores {@link #iface},
		* since operation counts are at data layer.
		*/
		@Deprecated
		public void spliceOperationsFrom(NetworkStats stats) {
		for (int i = 0; i < size; i++) {
		final int j = stats.findIndex(IFACE_ALL, uid[i], set[i], tag[i]);
		final int j = stats.findIndex(iface[i], uid[i], set[i], tag[i]);
		if (j == -1) {
		operations[i] = 0;
		} else {

+3 −2

Original line number	Diff line number	Diff line
		@@ -500,6 +500,9 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
		Binder.restoreCallingIdentity(token);
		}

		// splice in operation counts
		networkLayer.spliceOperationsFrom(mUidOperations);

		final NetworkStats dataLayer = new NetworkStats(
		networkLayer.getElapsedRealtime(), networkLayer.size());

		@@ -510,8 +513,6 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
		dataLayer.combineValues(entry);
		}

		// splice in operation counts
		dataLayer.spliceOperationsFrom(mUidOperations);
		return dataLayer;
		}