Merge "Add the fixed test case back into presubmit" am: 3763316aeb

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1930827

Change-Id: Ie127f5ed35a50952eab0b5049fdd6259c04124e2
This commit is contained in:
Treehugger Robot
2021-12-27 10:14:26 +00:00
committed by Automerger Merge Worker

View File

@@ -85,7 +85,6 @@ import com.android.modules.utils.build.SdkLevel;
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 @@ public class ConnectivityDiagnosticsManagerTest {
cb.assertNoCallback();
}
@SkipPresubmit(reason = "Flaky: b/159718782; add to presubmit after fixing")
@Test
public void testRegisterCallbackWithCarrierPrivileges() throws Exception {
assumeTrue(mPackageManager.hasSystemFeature(FEATURE_TELEPHONY));