Merge "Frameworks: Mark tests" am: 997937820d am: 043d868185

am: 6ae05e38bd

Change-Id: I55b62b64236937c66a21ec667216f7f1d505a5b5

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

@@ -318,6 +318,7 @@ public class ConnectivityServiceTest {
 
     // This test has an inherent race condition in it, and cannot be enabled for continuous testing
     // or presubmit tests. It is kept for manual runs and documentation purposes.
+    @Ignore
     public void verifyThatNotWaitingForIdleCausesRaceConditions() {
         // Bring up a network that we can use to send messages to ConnectivityService.
         ConditionVariable cv = waitForConnectivityBroadcasts(1);