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

Merge "Add session ID to VpnTransportInfo"

Browse Source
This commit is contained in:
Frank Li
2021-04-06 06:50:48 +00:00
committed by Gerrit Code Review
parent 601140eef7 dbee04c122
commit d47c7d9765
4 changed files with 59 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/net/java/com/android/server/ConnectivityServiceTest.java
View File

@@ -1233,10 +1233,12 @@ public class ConnectivityServiceTest {
if (mAgentRegistered) throw new IllegalStateException("already registered");
updateState(NetworkInfo.DetailedState.CONNECTING, "registerAgent");
mConfig = new VpnConfig();
mConfig.session = "MySession12345";
setUids(uids);
if (!isAlwaysMetered) mNetworkCapabilities.addCapability(NET_CAPABILITY_NOT_METERED);
mInterface = VPN_IFNAME;
mNetworkCapabilities.setTransportInfo(new VpnTransportInfo(getActiveVpnType()));
mNetworkCapabilities.setTransportInfo(new VpnTransportInfo(getActiveVpnType(),
mConfig.session));
mMockNetworkAgent = new TestNetworkAgentWrapper(TRANSPORT_VPN, lp,
mNetworkCapabilities);
mMockNetworkAgent.waitForIdle(TIMEOUT_MS);