joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Split parts of L2capNetwork constructor into a static create()

Browse source 
Provisioning can fail if the interface disappears. This CL splits
IpClient provisioning into the create function which will eventually
return null when provisioning fails.

Test: TH
Change-Id: Ie815b0781c7642c05684438525290067d17d1a9e
This commit is contained in:
Patrick Rohr 2025-02-19 15:51:47 -08:00
commit ea137bd5eb
2 changed files with 20 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
service/src/com/android/server/L2capNetworkProvider.java
View file

@ -243,7 +243,7 @@ public class L2capNetworkProvider {
return null;
}
return new L2capNetwork(mHandler, mContext, mProvider, ifname, socket, tunFd, caps, cb);
return L2capNetwork.create(mHandler, mContext, mProvider, ifname, socket, tunFd, caps, cb);
}
private static void closeBluetoothSocket(BluetoothSocket socket) {

34
service/src/com/android/server/net/L2capNetwork.java
View file

@ -42,10 +42,8 @@ public class L2capNetwork {
private static final NetworkScore NETWORK_SCORE = new NetworkScore.Builder().build();
private final String mLogTag;
private final Handler mHandler;
private final String mIfname;
private final L2capPacketForwarder mForwarder;
private final NetworkCapabilities mNetworkCapabilities;
private final L2capIpClient mIpClient;
private final NetworkAgent mNetworkAgent;
/** IpClient wrapper to handle IPv6 link-local provisioning for L2CAP tun.
@ -102,29 +100,24 @@ public class L2capNetwork {
void onNetworkUnwanted(L2capNetwork network);
}
public L2capNetwork(Handler handler, Context context, NetworkProvider provider, String ifname,
BluetoothSocket socket, ParcelFileDescriptor tunFd,
NetworkCapabilities networkCapabilities, ICallback cb) {
// TODO: add a check that this constructor is invoked on the handler thread.
mLogTag = String.format("L2capNetwork[%s]", ifname);
public L2capNetwork(String logTag, Handler handler, Context context, NetworkProvider provider,
BluetoothSocket socket, ParcelFileDescriptor tunFd, NetworkCapabilities nc,
LinkProperties lp, ICallback cb) {
mLogTag = logTag;
mHandler = handler;
mIfname = ifname;
mNetworkCapabilities = nc;
// Guaranteed non-null.
final L2capNetworkSpecifier spec =
(L2capNetworkSpecifier) networkCapabilities.getNetworkSpecifier();
final L2capNetworkSpecifier spec = (L2capNetworkSpecifier) nc.getNetworkSpecifier();
final boolean compressHeaders = spec.getHeaderCompression() == HEADER_COMPRESSION_6LOWPAN;
mForwarder = new L2capPacketForwarder(handler, tunFd, socket, compressHeaders, () -> {
// TODO: add a check that this callback is invoked on the handler thread.
cb.onError(L2capNetwork.this);
});
mNetworkCapabilities = networkCapabilities;
mIpClient = new L2capIpClient(mLogTag, context, ifname);
final LinkProperties linkProperties = mIpClient.start();
final NetworkAgentConfig config = new NetworkAgentConfig.Builder().build();
mNetworkAgent = new NetworkAgent(context, mHandler.getLooper(), mLogTag,
networkCapabilities, linkProperties, NETWORK_SCORE, config, provider) {
nc, lp, NETWORK_SCORE, config, provider) {
@Override
public void onNetworkUnwanted() {
Log.i(mLogTag, mIfname + ": Network is unwanted");
@ -136,6 +129,17 @@ public class L2capNetwork {
mNetworkAgent.markConnected();
}
/** Create an L2capNetwork or return null on failure. */
@Nullable
public static L2capNetwork create(Handler handler, Context context, NetworkProvider provider,
String ifname, BluetoothSocket socket, ParcelFileDescriptor tunFd,
NetworkCapabilities nc, ICallback cb) {
// TODO: add a check that this function is invoked on the handler thread.
final String logTag = String.format("L2capNetwork[%s]", ifname);
final LinkProperties lp = new L2capIpClient(logTag, context, ifname).start();
return new L2capNetwork(logTag, handler, context, provider, socket, tunFd, nc, lp, cb);
}
/** Get the NetworkCapabilities used for this Network */
public NetworkCapabilities getNetworkCapabilities() {
return mNetworkCapabilities;