Merge "Disable a flaky test" am: 932dda858a

am: 54546f8429 Change-Id: Ie1fccb536e6df45491139ead179e8f5c2127d98f
2019-12-03 08:38:00 -08:00
parent e78a4b9168 54546f8429
commit c8ce461f68
1 changed files with 1 additions and 0 deletions
--- a/tests/net/java/com/android/server/ConnectivityServiceTest.java
+++ b/tests/net/java/com/android/server/ConnectivityServiceTest.java
@@ -5644,6 +5644,7 @@ public class ConnectivityServiceTest {
        mCm.unregisterNetworkCallback(defaultCallback);
    }

+    @Ignore // 40%+ flakiness : figure out why and re-enable.
    @Test
    public final void testBatteryStatsNetworkType() throws Exception {
        final LinkProperties cellLp = new LinkProperties();