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

Merge changes I7ea39b80,I6b9979f3 am: 310d1dac0d am: 3efc93af3d am: 243e5f21ea

Browse Source 
Change-Id: I97bd2471b04d9a6291b03a989ccd618c2dc70c6e
This commit is contained in:
Automerger Merge Worker
2020-01-13 04:51:33 +00:00
parent 934e051607 243e5f21ea
commit 8ae3471952
5 changed files with 83 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/net/java/com/android/server/connectivity/LingerMonitorTest.java
View File

@@ -36,9 +36,9 @@ import android.net.IDnsResolver;
import android.net.INetd;
import android.net.Network;
import android.net.NetworkCapabilities;
import android.net.NetworkFactory;
import android.net.NetworkInfo;
import android.net.NetworkMisc;
import android.net.NetworkProvider;
import android.net.NetworkScore;
import android.os.INetworkManagementService;
import android.text.format.DateUtils;
@@ -359,7 +359,7 @@ public class LingerMonitorTest {
ns.putIntExtension(NetworkScore.LEGACY_SCORE, 50);
NetworkAgentInfo nai = new NetworkAgentInfo(null, null, new Network(netId), info, null,
caps, ns, mCtx, null, mMisc, mConnService, mNetd, mDnsResolver, mNMS,
NetworkFactory.SerialNumber.NONE);
NetworkProvider.ID_NONE);
nai.everValidated = true;
return nai;
}