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

Merge "Crash bad callers earlier" am: 7a30d04659 am: ad329392a7 am: c04b1e707f

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

Change-Id: I208aad86a1315e452f723eb1d130d9af2bbd5693
This commit is contained in:
Paul Hu
2021-10-20 07:32:12 +00:00
committed by Automerger Merge Worker
parent 9763c2ec56 c04b1e707f
commit efca18d4cc
2 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/unit/java/com/android/server/connectivity/Nat464XlatTest.java
View File

@@ -109,8 +109,8 @@ public class Nat464XlatTest {
mNai.linkProperties = new LinkProperties();
mNai.linkProperties.setInterfaceName(BASE_IFACE);
mNai.networkInfo = new NetworkInfo(null);
mNai.networkInfo.setType(ConnectivityManager.TYPE_WIFI);
mNai.networkInfo = new NetworkInfo(ConnectivityManager.TYPE_WIFI, 0 /* subtype */,
null /* typeName */, null /* subtypeName */);
mNai.networkCapabilities = new NetworkCapabilities();
markNetworkConnected();
when(mNai.connService()).thenReturn(mConnectivity);