LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Fix MultinetworkApiTest for instant mode" am: f2987a79a2

Browse Source 
am: 1802980b98

Change-Id: I8cc151075f375597f71c5bb19e750475487b8209
This commit is contained in:
Luke Huang
2019-12-03 08:49:51 -08:00
committed by android-build-merger
parent cecf84247e 1802980b98
commit a503dd1e70
1 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
tests/cts/net/src/android/net/cts/MultinetworkApiTest.java
View File

@@ -25,6 +25,7 @@ import android.net.Network;
import android.net.NetworkCapabilities; import android.net.NetworkCapabilities;
import android.net.NetworkUtils; import android.net.NetworkUtils;
import android.net.cts.util.CtsNetUtils; import android.net.cts.util.CtsNetUtils;
import android.platform.test.annotations.AppModeFull;
import android.provider.Settings; import android.provider.Settings;
import android.system.ErrnoException; import android.system.ErrnoException;
import android.system.OsConstants; import android.system.OsConstants;
@@ -73,7 +74,6 @@ public class MultinetworkApiTest extends AndroidTestCase {
@Override @Override
protected void tearDown() throws Exception { protected void tearDown() throws Exception {
restorePrivateDnsSetting();
super.tearDown(); super.tearDown();
} }
@@ -214,7 +214,7 @@ public class MultinetworkApiTest extends AndroidTestCase {
} catch (IllegalArgumentException e) {} } catch (IllegalArgumentException e) {}
} }
public void testResNApi() throws InterruptedException { public void testResNApi() throws Exception {
final Network[] testNetworks = getTestableNetworks(); final Network[] testNetworks = getTestableNetworks();
for (Network network : testNetworks) { for (Network network : testNetworks) {
@@ -232,16 +232,24 @@ public class MultinetworkApiTest extends AndroidTestCase {
runResNnxDomainCheck(network.getNetworkHandle()); runResNnxDomainCheck(network.getNetworkHandle());
} }
} }
}
@AppModeFull(reason = "WRITE_SECURE_SETTINGS permission can't be granted to instant apps")
public void testResNApiNXDomainPrivateDns() throws InterruptedException {
// 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
Settings.Global.putString(mCR, Settings.Global.PRIVATE_DNS_MODE, "hostname"); try {
Settings.Global.putString(mCR, Settings.Global.putString(mCR, Settings.Global.PRIVATE_DNS_MODE, "hostname");
Settings.Global.PRIVATE_DNS_SPECIFIER, GOOGLE_PRIVATE_DNS_SERVER); Settings.Global.putString(mCR,
for (Network network : testNetworks) { Settings.Global.PRIVATE_DNS_SPECIFIER, GOOGLE_PRIVATE_DNS_SERVER);
// Wait for private DNS setting to propagate. for (Network network : getTestableNetworks()) {
mCtsNetUtils.awaitPrivateDnsSetting("NxDomain test wait private DNS setting timeout", // Wait for private DNS setting to propagate.
network, GOOGLE_PRIVATE_DNS_SERVER, PRIVATE_DNS_SETTING_TIMEOUT_MS); mCtsNetUtils.awaitPrivateDnsSetting("NxDomain test wait private DNS setting timeout",
runResNnxDomainCheck(network.getNetworkHandle()); network, GOOGLE_PRIVATE_DNS_SERVER, PRIVATE_DNS_SETTING_TIMEOUT_MS);
runResNnxDomainCheck(network.getNetworkHandle());
}
} finally {
restorePrivateDnsSetting();
} }
} }
} }