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

Merge "Fill ConnectivityService in testDumpDoesNotCrash()" into main

Browse Source
This commit is contained in:
Hansen Kurli
2023-10-31 05:52:02 +00:00
committed by Gerrit Code Review
parent 6b134f18f4 49f7ab9eeb
commit a9b72ba71b
1 changed files with 39 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
tests/unit/java/com/android/server/ConnectivityServiceTest.java
View File

@@ -13235,7 +13235,7 @@ public class ConnectivityServiceTest {
}
@Test
public void testDumpDoesNotCrash() {
public void testDumpDoesNotCrash() throws Exception {
mServiceContext.setPermission(DUMP, PERMISSION_GRANTED);
// Filing a couple requests prior to testing the dump.
final TestNetworkCallback genericNetworkCallback = new TestNetworkCallback();
@@ -13247,6 +13247,44 @@ public class ConnectivityServiceTest {
mCm.registerNetworkCallback(genericRequest, genericNetworkCallback);
mCm.registerNetworkCallback(wifiRequest, wifiNetworkCallback);
// NetworkProvider
final NetworkProvider wifiProvider = new NetworkProvider(mServiceContext,
mCsHandlerThread.getLooper(), "Wifi provider");
mCm.registerNetworkProvider(wifiProvider);
// NetworkAgent
final LinkProperties wifiLp = new LinkProperties();
wifiLp.setInterfaceName(WIFI_IFNAME);
mWiFiAgent = new TestNetworkAgentWrapper(TRANSPORT_WIFI, wifiLp);
mWiFiAgent.connect(true);
// NetworkOffer
final NetworkScore wifiScore = new NetworkScore.Builder().build();
final NetworkCapabilities wifiCaps = new NetworkCapabilities.Builder()
.addTransportType(TRANSPORT_WIFI)
.addCapability(NET_CAPABILITY_INTERNET)
.addCapability(NET_CAPABILITY_NOT_VCN_MANAGED)
.build();
final TestableNetworkOfferCallback wifiCallback = new TestableNetworkOfferCallback(
TIMEOUT_MS /* timeout */, TEST_CALLBACK_TIMEOUT_MS /* noCallbackTimeout */);
wifiProvider.registerNetworkOffer(wifiScore, wifiCaps, r -> r.run(), wifiCallback);
// Profile preferences
final UserHandle testHandle = setupEnterpriseNetwork();
final TestNetworkAgentWrapper workAgent = makeEnterpriseNetworkAgent();
workAgent.connect(true);
mCm.setProfileNetworkPreference(testHandle, PROFILE_NETWORK_PREFERENCE_ENTERPRISE,
null /* executor */, null /* listener */);
// OEM preferences
@OemNetworkPreferences.OemNetworkPreference final int networkPref =
OEM_NETWORK_PREFERENCE_OEM_PAID;
setOemNetworkPreferenceAgentConnected(TRANSPORT_CELLULAR, true);
setOemNetworkPreference(networkPref, TEST_PACKAGE_NAME);
// Mobile data preferred UIDs
setAndUpdateMobileDataPreferredUids(Set.of(TEST_PACKAGE_UID));
verifyDump(new String[0]);
// Verify dump with arguments.