commit 3763316aebf3f307daf91689562d676b37832aa3
author Treehugger Robot <treehugger-gerrit@google.com> Mon Dec 27 10:02:52 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Dec 27 10:02:52 2021 +0000
tree 5ba03acf6602bb4b6e9654c588fa7561987076dd
parent e32642e752ac173c5b571b7bd7955ef30d317599
parent cd700e4864675cb89c64502407833d9bb18a0a0c

Merge "Add the fixed test case back into presubmit"

tests/cts/net/src/android/net/cts/ConnectivityDiagnosticsManagerTest.java

diff --git a/tests/cts/net/src/android/net/cts/ConnectivityDiagnosticsManagerTest.java b/tests/cts/net/src/android/net/cts/ConnectivityDiagnosticsManagerTest.java
index c9fed44..232114e 100644
--- a/tests/cts/net/src/android/net/cts/ConnectivityDiagnosticsManagerTest.java
+++ b/tests/cts/net/src/android/net/cts/ConnectivityDiagnosticsManagerTest.java
@@ -85,7 +85,6 @@
 import com.android.net.module.util.ArrayTrackRecord;
 import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo;
 import com.android.testutils.DevSdkIgnoreRunner;
-import com.android.testutils.SkipPresubmit;
 
 import org.junit.After;
 import org.junit.Before;
@@ -207,7 +206,6 @@
         cb.assertNoCallback();
     }
 
-    @SkipPresubmit(reason = "Flaky: b/159718782; add to presubmit after fixing")
     @Test
     public void testRegisterCallbackWithCarrierPrivileges() throws Exception {
         assumeTrue(mPackageManager.hasSystemFeature(FEATURE_TELEPHONY));