Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ab72685e authored by Maciej Żenczykowski's avatar Maciej Żenczykowski Committed by Automerger Merge Worker
Browse files

fix... 

fix com.android.server.net.NetworkStatsFactoryTest#testDoubleClatAccounting100MBDownload am: e07aa4a4

Change-Id: I9fea19ddd38b51b65f79c59a53739e94dc833152
parents 2781fe4f e07aa4a4

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

+3 −5
Original line number Diff line number Diff line
@@ -468,9 +468,7 @@ public class NetworkStatsFactoryTest extends NetworkStatsBaseTest { 
        long appRxBytesAfter = 439237478L;

        assertEquals("App traffic should be ~100MB", 110553449, appRxBytesAfter - appRxBytesBefore);



        long rootRxBytesBefore = 1394011L;

        long rootRxBytesAfter = 1398634L;

        assertEquals("UID 0 traffic should be ~0", 4623, rootRxBytesAfter - rootRxBytesBefore);

        long rootRxBytes = 330187296L;



        mFactory.noteStackedIface("v4-wlan0", "wlan0");

        NetworkStats stats;
@@ -478,12 +476,12 @@ public class NetworkStatsFactoryTest extends NetworkStatsBaseTest { 
        // Stats snapshot before the download

        stats = parseDetailedStats(R.raw.xt_qtaguid_with_clat_100mb_download_before);

        assertStatsEntry(stats, "v4-wlan0", 10106, SET_FOREGROUND, 0x0, appRxBytesBefore, 5199872L);

        assertStatsEntry(stats, "wlan0", 0, SET_DEFAULT, 0x0, rootRxBytesBefore, 0L);

        assertStatsEntry(stats, "wlan0", 0, SET_DEFAULT, 0x0, rootRxBytes, 0L);



        // Stats snapshot after the download

        stats = parseDetailedStats(R.raw.xt_qtaguid_with_clat_100mb_download_after);

        assertStatsEntry(stats, "v4-wlan0", 10106, SET_FOREGROUND, 0x0, appRxBytesAfter, 7867488L);

        assertStatsEntry(stats, "wlan0", 0, SET_DEFAULT, 0x0, rootRxBytesAfter, 0L);

        assertStatsEntry(stats, "wlan0", 0, SET_DEFAULT, 0x0, rootRxBytes, 0L);

    }



    /**

tests/net/res/raw/xt_qtaguid_with_clat_100mb_download_after

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ idx iface acct_tag_hex uid_tag_int cnt_set rx_bytes rx_packets tx_bytes tx_packe 
9 v4-wlan0 0x0 10057 1 728 7 392 7 0 0 728 7 0 0 0 0 392 7 0 0

10 v4-wlan0 0x0 10106 0 2232 18 2232 18 0 0 2232 18 0 0 0 0 2232 18 0 0

11 v4-wlan0 0x0 10106 1 432952718 314238 5442288 121260 432950238 314218 2480 20 0 0 5433900 121029 8388 231 0 0

12 wlan0 0x0 0 0 440746376 329772 0 0 439660007 315369 232001 1276 854368 13127 0 0 0 0 0 0

12 wlan0 0x0 0 0 330187296 250652 0 0 329106990 236273 226202 1255 854104 13124 0 0 0 0 0 0

13 wlan0 0x0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0

14 wlan0 0x0 1000 0 77113 272 56151 575 77113 272 0 0 0 0 19191 190 36960 385 0 0

15 wlan0 0x0 1000 1 20227 80 8356 72 18539 74 1688 6 0 0 7562 66 794 6 0 0