commit 324a5da160fbc8283698cc8d56cefa5f0dc3f1fe
author Wally Yau <wyau@google.com> Mon Mar 28 18:12:25 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Mar 28 18:12:25 2016 +0000
tree f1767fd0c77adf7a8e3ebb497be04cf78304789e
parent d857ae7745c7b865a1fdbfbf1754c3840fbdc705
parent 8bdae2314764ab049265aa531bec838ce90d13f5

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

* commit '810b12cbb62c4c91f5deab49b228916bdb6f2708':
  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 +