Merge "Fix MultinetworkApiTest fail problem in instant mode" am: 3475b733b5
Original change: https://android-review.googlesource.com/c/platform/cts/+/1326955 Change-Id: I70b8832c7b00cff6d8f9154e4f5b97a3d2fc28de
This commit is contained in:
@@ -68,7 +68,6 @@ public class MultinetworkApiTest extends AndroidTestCase {
|
|||||||
mCM = (ConnectivityManager) getContext().getSystemService(Context.CONNECTIVITY_SERVICE);
|
mCM = (ConnectivityManager) getContext().getSystemService(Context.CONNECTIVITY_SERVICE);
|
||||||
mCR = getContext().getContentResolver();
|
mCR = getContext().getContentResolver();
|
||||||
mCtsNetUtils = new CtsNetUtils(getContext());
|
mCtsNetUtils = new CtsNetUtils(getContext());
|
||||||
mCtsNetUtils.storePrivateDnsSetting();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -223,6 +222,7 @@ public class MultinetworkApiTest extends AndroidTestCase {
|
|||||||
|
|
||||||
@AppModeFull(reason = "WRITE_SECURE_SETTINGS permission can't be granted to instant apps")
|
@AppModeFull(reason = "WRITE_SECURE_SETTINGS permission can't be granted to instant apps")
|
||||||
public void testResNApiNXDomainPrivateDns() throws InterruptedException {
|
public void testResNApiNXDomainPrivateDns() throws InterruptedException {
|
||||||
|
mCtsNetUtils.storePrivateDnsSetting();
|
||||||
// Enable private DNS strict mode and set server to dns.google before doing NxDomain test.
|
// Enable private DNS strict mode and set server to dns.google before doing NxDomain test.
|
||||||
// b/144521720
|
// b/144521720
|
||||||
try {
|
try {
|
||||||
|
|||||||
Reference in New Issue
Block a user