commit 8bdae2314764ab049265aa531bec838ce90d13f5
author Wally Yau <wyau@google.com> Mon Mar 28 18:04:32 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Mar 28 18:04:32 2016 +0000
tree 21ad9975b715a4469a51d5f941c5ffaa82eb4e20
parent de0ad869200adea9c9bb89f05f4e0f97f205015a
parent d7f1dbef6694f4389d0df76ed292b84f746b4ae0

Merge "Fixed test for lingering traffic data." into marshmallow-cts-dev
am: 0f7a74c

* commit '0f7a74c9f99bac16d6c599afc38d5f82cebb0ef3':
  Fixed test for lingering traffic data.

tests/cts/net/src/android/net/cts/TrafficStatsTest.java

diff --git a/tests/cts/net/src/android/net/cts/TrafficStatsTest.java b/tests/cts/net/src/android/net/cts/TrafficStatsTest.java
index 5b93bee..a8dd8ac 100755
--- a/tests/cts/net/src/android/net/cts/TrafficStatsTest.java
+++ b/tests/cts/net/src/android/net/cts/TrafficStatsTest.java
@@ -215,7 +215,7 @@
         if (deltaTxOtherPackets > 0 || deltaRxOtherPackets > 0) {
             Log.i(LOG_TAG, "lingering traffic data: " + deltaTxOtherPackets + "/" + deltaRxOtherPackets);
             // Make sure that not too many non-localhost packets are accounted for
-            assertTrue("too many non-localhost packets on the sam UID", deltaTxOtherPackets + deltaTxOtherPackets < 20);
+            assertTrue("too many non-localhost packets on the same UID", deltaTxOtherPackets + deltaRxOtherPackets < 20);
         }
 
         assertTrue("uidtxp: " + uidTxPacketsBefore + " -> " + uidTxPacketsAfter + " delta=" + uidTxDeltaPackets +