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

Merge "Support wifi and ethernet connection for DnsResolverTest." am: f822038c1c

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

Change-Id: I3ae21d9b034e455ba48d9576712a102ccda0f647
This commit is contained in:
Treehugger Robot
2021-10-06 08:52:12 +00:00
committed by Automerger Merge Worker
parent 7f40360e32 f822038c1c
commit 6e1c375f50
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tests/cts/net/src/android/net/cts/DnsResolverTest.java
View File

@@ -22,6 +22,7 @@ import static android.net.DnsResolver.FLAG_NO_CACHE_LOOKUP;
import static android.net.DnsResolver.TYPE_A; import static android.net.DnsResolver.TYPE_A;
import static android.net.DnsResolver.TYPE_AAAA; import static android.net.DnsResolver.TYPE_AAAA;
import static android.net.NetworkCapabilities.TRANSPORT_CELLULAR; import static android.net.NetworkCapabilities.TRANSPORT_CELLULAR;
import static android.net.cts.util.CtsNetUtils.TestNetworkCallback;
import static android.system.OsConstants.ETIMEDOUT; import static android.system.OsConstants.ETIMEDOUT;
import android.annotation.NonNull; import android.annotation.NonNull;
@@ -100,6 +101,7 @@ public class DnsResolverTest extends AndroidTestCase {
private String mOldMode; private String mOldMode;
private String mOldDnsSpecifier; private String mOldDnsSpecifier;
private TestNetworkCallback mWifiRequestCallback = null;
@Override @Override
protected void setUp() throws Exception { protected void setUp() throws Exception {
@@ -117,6 +119,9 @@ public class DnsResolverTest extends AndroidTestCase {
@Override @Override
protected void tearDown() throws Exception { protected void tearDown() throws Exception {
mCtsNetUtils.restorePrivateDnsSetting(); mCtsNetUtils.restorePrivateDnsSetting();
if (mWifiRequestCallback != null) {
mCM.unregisterNetworkCallback(mWifiRequestCallback);
}
super.tearDown(); super.tearDown();
} }
@@ -132,6 +137,14 @@ public class DnsResolverTest extends AndroidTestCase {
private Network[] getTestableNetworks() { private Network[] getTestableNetworks() {
if (mPackageManager.hasSystemFeature(PackageManager.FEATURE_WIFI)) { if (mPackageManager.hasSystemFeature(PackageManager.FEATURE_WIFI)) {
// File a NetworkRequest for Wi-Fi, so it connects even if a higher-scoring
// network, such as Ethernet, is already connected.
final NetworkRequest request = new NetworkRequest.Builder()
.addTransportType(NetworkCapabilities.TRANSPORT_WIFI)
.addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
.build();
mWifiRequestCallback = new TestNetworkCallback();
mCM.requestNetwork(request, mWifiRequestCallback);
mCtsNetUtils.ensureWifiConnected(); mCtsNetUtils.ensureWifiConnected();
} }
final ArrayList<Network> testableNetworks = new ArrayList<Network>(); final ArrayList<Network> testableNetworks = new ArrayList<Network>();