commit 86ba00d2a9f6576fd3e370e435a5c0628e0dff10
author Jun Tahara <jun.xb.tahara@sonymobile.com> Wed Jun 22 00:20:07 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jun 22 00:20:07 2016 +0000
tree 114170e6a7aba2cf50da384d47405c1e3b48a943
parent abc35d5527b1621e4e672768688f1b9461cbe14a
parent fd1fb4d863f15d067119a8590fc05b1d1d30c406

Merge \\\\\"Remove non-CTS packets assertion code\\\\\" into marshmallow-cts-dev am: 0ba763ab98 am: 6ce150c6ae am: 5c4a3982a8 am: fd1fb4d863
am: 995005d649

Change-Id: I40f34d7a22b09a4ef5a4190f2a236b643062f306

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 a8dd8ac..930c742 100755
--- a/tests/cts/net/src/android/net/cts/TrafficStatsTest.java
+++ b/tests/cts/net/src/android/net/cts/TrafficStatsTest.java
@@ -214,8 +214,6 @@
         long deltaRxOtherPackets = (totalRxPacketsAfter - totalRxPacketsBefore) - uidRxDeltaPackets;
         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 same UID", deltaTxOtherPackets + deltaRxOtherPackets < 20);
         }
 
         assertTrue("uidtxp: " + uidTxPacketsBefore + " -> " + uidTxPacketsAfter + " delta=" + uidTxDeltaPackets +