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

Merge "Extract test utilities for ConnectivityService" am: b7d270a73e am: b374d3953c am: 0e84cb5bfa am: 1563afc646

Browse Source 
am: e2967d9830

Change-Id: I0bb8a965d11e9f16ac70f62a2319e1dc8e7544df
This commit is contained in:
Remi NGUYEN VAN
2019-08-06 16:31:01 -07:00
committed by android-build-merger
parent 6af6fd916e 1563afc646
commit 803a958445
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/IpSecService.java
View File

@@ -750,10 +750,10 @@ public class IpSecService extends IIpSecService.Stub {
} }
} }
// These values have been reserved in ConnectivityService // These values have been reserved in NetIdManager
@VisibleForTesting static final int TUN_INTF_NETID_START = 0xFC00; @VisibleForTesting static final int TUN_INTF_NETID_START = 0xFC00;
@VisibleForTesting static final int TUN_INTF_NETID_RANGE = 0x0400; public static final int TUN_INTF_NETID_RANGE = 0x0400;
private final SparseBooleanArray mTunnelNetIds = new SparseBooleanArray(); private final SparseBooleanArray mTunnelNetIds = new SparseBooleanArray();
private int mNextTunnelNetIdIndex = 0; private int mNextTunnelNetIdIndex = 0;