Merge "Add the fixed test case back into presubmit"
This commit is contained in:
@@ -85,7 +85,6 @@ import com.android.modules.utils.build.SdkLevel;
|
|||||||
import com.android.net.module.util.ArrayTrackRecord;
|
import com.android.net.module.util.ArrayTrackRecord;
|
||||||
import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo;
|
import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo;
|
||||||
import com.android.testutils.DevSdkIgnoreRunner;
|
import com.android.testutils.DevSdkIgnoreRunner;
|
||||||
import com.android.testutils.SkipPresubmit;
|
|
||||||
|
|
||||||
import org.junit.After;
|
import org.junit.After;
|
||||||
import org.junit.Before;
|
import org.junit.Before;
|
||||||
@@ -207,7 +206,6 @@ public class ConnectivityDiagnosticsManagerTest {
|
|||||||
cb.assertNoCallback();
|
cb.assertNoCallback();
|
||||||
}
|
}
|
||||||
|
|
||||||
@SkipPresubmit(reason = "Flaky: b/159718782; add to presubmit after fixing")
|
|
||||||
@Test
|
@Test
|
||||||
public void testRegisterCallbackWithCarrierPrivileges() throws Exception {
|
public void testRegisterCallbackWithCarrierPrivileges() throws Exception {
|
||||||
assumeTrue(mPackageManager.hasSystemFeature(FEATURE_TELEPHONY));
|
assumeTrue(mPackageManager.hasSystemFeature(FEATURE_TELEPHONY));
|
||||||
|
|||||||
Reference in New Issue
Block a user