Merge "Extract test utilities for ConnectivityService" am: b7d270a73e am: b374d3953c

am: 0e84cb5bfa

Change-Id: Ib760ef922a440d54bab8c1647d8444ab2a717094
This commit is contained in:
Remi NGUYEN VAN
2019-08-06 15:57:04 -07:00
committed by android-build-merger

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_RANGE = 0x0400;
public static final int TUN_INTF_NETID_RANGE = 0x0400;
private final SparseBooleanArray mTunnelNetIds = new SparseBooleanArray();
private int mNextTunnelNetIdIndex = 0;