[SP25] Rename functions that add Entry conditionally am: 32fb2a0e7c (9268b048) · Commits · e / os / android_frameworks_base

api/system-current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -6409,7 +6409,7 @@ package android.net {
		public final class NetworkStats implements android.os.Parcelable {
		ctor public NetworkStats(long, int);
		method @NonNull public android.net.NetworkStats add(@NonNull android.net.NetworkStats);
		method @NonNull public android.net.NetworkStats addValues(@NonNull android.net.NetworkStats.Entry);
		method @NonNull public android.net.NetworkStats addEntry(@NonNull android.net.NetworkStats.Entry);
		method public int describeContents();
		method @NonNull public android.net.NetworkStats subtract(@NonNull android.net.NetworkStats);
		method public void writeToParcel(@NonNull android.os.Parcel, int);

core/java/android/net/NetworkStats.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -721,7 +721,7 @@ public final class NetworkStats implements Parcelable {
		* @param entry the {@link Entry} to add.
		* @return a new constructed {@link NetworkStats} object that contains the result.
		*/
		public @NonNull NetworkStats addValues(@NonNull Entry entry) {
		public @NonNull NetworkStats addEntry(@NonNull Entry entry) {
		return this.clone().combineValues(entry);
		}

packages/Tethering/src/com/android/server/connectivity/tethering/OffloadController.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -284,7 +284,7 @@ public class OffloadController {
		final ForwardedStats value = kv.getValue();
		final Entry entry = new Entry(kv.getKey(), uid, SET_DEFAULT, TAG_NONE, METERED_NO,
		ROAMING_NO, DEFAULT_NETWORK_NO, value.rxBytes, 0L, value.txBytes, 0L, 0L);
		stats = stats.addValues(entry);
		stats = stats.addEntry(entry);
		}

		return stats;

packages/Tethering/tests/unit/src/com/android/server/connectivity/tethering/OffloadControllerTest.java

+12 −12

Original line number	Diff line number	Diff line
		@@ -446,12 +446,12 @@ public class OffloadControllerTest {
		final NetworkStats ifaceStats = mTetherStatsProvider.getTetherStats(STATS_PER_IFACE);
		final NetworkStats uidStats = mTetherStatsProvider.getTetherStats(STATS_PER_UID);
		final NetworkStats expectedIfaceStats = new NetworkStats(0L, 2)
		.addValues(buildTestEntry(STATS_PER_IFACE, mobileIface, 999, 99999))
		.addValues(buildTestEntry(STATS_PER_IFACE, ethernetIface, 12345, 54321));
		.addEntry(buildTestEntry(STATS_PER_IFACE, mobileIface, 999, 99999))
		.addEntry(buildTestEntry(STATS_PER_IFACE, ethernetIface, 12345, 54321));

		final NetworkStats expectedUidStats = new NetworkStats(0L, 2)
		.addValues(buildTestEntry(STATS_PER_UID, mobileIface, 999, 99999))
		.addValues(buildTestEntry(STATS_PER_UID, ethernetIface, 12345, 54321));
		.addEntry(buildTestEntry(STATS_PER_UID, mobileIface, 999, 99999))
		.addEntry(buildTestEntry(STATS_PER_UID, ethernetIface, 12345, 54321));

		assertTrue(orderInsensitiveEquals(expectedIfaceStats, ifaceStats));
		assertTrue(orderInsensitiveEquals(expectedUidStats, uidStats));
		@@ -485,12 +485,12 @@ public class OffloadControllerTest {
		final NetworkStats ifaceStatsAccu = mTetherStatsProvider.getTetherStats(STATS_PER_IFACE);
		final NetworkStats uidStatsAccu = mTetherStatsProvider.getTetherStats(STATS_PER_UID);
		final NetworkStats expectedIfaceStatsAccu = new NetworkStats(0L, 2)
		.addValues(buildTestEntry(STATS_PER_IFACE, mobileIface, 999, 99999))
		.addValues(buildTestEntry(STATS_PER_IFACE, ethernetIface, 112345, 154321));
		.addEntry(buildTestEntry(STATS_PER_IFACE, mobileIface, 999, 99999))
		.addEntry(buildTestEntry(STATS_PER_IFACE, ethernetIface, 112345, 154321));

		final NetworkStats expectedUidStatsAccu = new NetworkStats(0L, 2)
		.addValues(buildTestEntry(STATS_PER_UID, mobileIface, 999, 99999))
		.addValues(buildTestEntry(STATS_PER_UID, ethernetIface, 112345, 154321));
		.addEntry(buildTestEntry(STATS_PER_UID, mobileIface, 999, 99999))
		.addEntry(buildTestEntry(STATS_PER_UID, ethernetIface, 112345, 154321));

		assertTrue(orderInsensitiveEquals(expectedIfaceStatsAccu, ifaceStatsAccu));
		assertTrue(orderInsensitiveEquals(expectedUidStatsAccu, uidStatsAccu));
		@@ -499,12 +499,12 @@ public class OffloadControllerTest {
		reset(mTetherStatsProviderCb);
		mTetherStatsProvider.pushTetherStats();
		final NetworkStats expectedIfaceStatsDiff = new NetworkStats(0L, 2)
		.addValues(buildTestEntry(STATS_PER_IFACE, mobileIface, 0, 0))
		.addValues(buildTestEntry(STATS_PER_IFACE, ethernetIface, 100000, 100000));
		.addEntry(buildTestEntry(STATS_PER_IFACE, mobileIface, 0, 0))
		.addEntry(buildTestEntry(STATS_PER_IFACE, ethernetIface, 100000, 100000));

		final NetworkStats expectedUidStatsDiff = new NetworkStats(0L, 2)
		.addValues(buildTestEntry(STATS_PER_UID, mobileIface, 0, 0))
		.addValues(buildTestEntry(STATS_PER_UID, ethernetIface, 100000, 100000));
		.addEntry(buildTestEntry(STATS_PER_UID, mobileIface, 0, 0))
		.addEntry(buildTestEntry(STATS_PER_UID, ethernetIface, 100000, 100000));
		verify(mTetherStatsProviderCb, times(1))
		.notifyStatsUpdated(anyInt(), ifaceStatsCaptor.capture(), uidStatsCaptor.capture());
		assertTrue(orderInsensitiveEquals(expectedIfaceStatsDiff, ifaceStatsCaptor.getValue()));

tests/net/java/com/android/server/net/NetworkStatsServiceTest.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -1034,10 +1034,10 @@ public class NetworkStatsServiceTest extends NetworkStatsBaseTest {
		// Create some initial traffic and report to the service.
		incrementCurrentTime(HOUR_IN_MILLIS);
		final NetworkStats expectedStats = new NetworkStats(0L, 1)
		.addValues(new NetworkStats.Entry(TEST_IFACE, UID_RED, SET_DEFAULT,
		.addEntry(new NetworkStats.Entry(TEST_IFACE, UID_RED, SET_DEFAULT,
		TAG_NONE, METERED_YES, ROAMING_NO, DEFAULT_NETWORK_YES,
		128L, 2L, 128L, 2L, 1L))
		.addValues(new NetworkStats.Entry(TEST_IFACE, UID_RED, SET_DEFAULT,
		.addEntry(new NetworkStats.Entry(TEST_IFACE, UID_RED, SET_DEFAULT,
		0xF00D, METERED_YES, ROAMING_NO, DEFAULT_NETWORK_YES,
		64L, 1L, 64L, 1L, 1L));
		cb.notifyStatsUpdated(0 /* unused */, expectedStats, expectedStats);