From 04075c2af24ce01cc22ec34368b89138dfd354e6 Mon Sep 17 00:00:00 2001
From: Junyu Lai <junyulai@google.com>
Date: Thu, 26 May 2022 22:05:25 +0800
Subject: [PATCH] Disable NetworkStatsHistory builder test in tm-dev

The test cannot be run in tm-dev because tm-dev
use prebuilt mainline module, which does not include
the solution in previous patch yet. Hence, disable
the test temporarily.

Ignore-AOSP-First: Base change not in AOSP, will cherry-pick
                   immediately after
Test: atest android.net.netstats.NetworkStatsHistoryTest
Bug: 233825704
Change-Id: I770a10bfd1b3b2068b2e116207bd6cdbecf9face
Merged-In: Ib2fbd3c7703e9ed606650643db6e1977f550d90d
---
 .../java/android/net/netstats/NetworkStatsHistoryTest.kt       | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/common/java/android/net/netstats/NetworkStatsHistoryTest.kt b/tests/common/java/android/net/netstats/NetworkStatsHistoryTest.kt
index a6c9f3cebd..9343ea16c8 100644
--- a/tests/common/java/android/net/netstats/NetworkStatsHistoryTest.kt
+++ b/tests/common/java/android/net/netstats/NetworkStatsHistoryTest.kt
@@ -22,6 +22,7 @@ import androidx.test.filters.SmallTest
 import com.android.testutils.ConnectivityModuleTest
 import com.android.testutils.DevSdkIgnoreRule
 import com.android.testutils.SC_V2
+import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -36,6 +37,7 @@ class NetworkStatsHistoryTest {
     @JvmField
     val ignoreRule = DevSdkIgnoreRule(ignoreClassUpTo = SC_V2)
 
+    @Ignore
     @Test
     fun testBuilder() {
         val entry1 = NetworkStatsHistory.Entry(10, 30, 40, 4, 50, 5, 60)
@@ -61,6 +63,7 @@ class NetworkStatsHistoryTest {
         statsMultiple.assertEntriesEqual(entry3, entry1, entry2)
     }
 
+    @Ignore
     @Test
     fun testBuilderSortAndDeduplicate() {
         val entry1 = NetworkStatsHistory.Entry(10, 30, 40, 4, 50, 5, 60)