commit 56ced95d2a8c3c2428d957c0bc1803823233e002
author Patrick Rohr <prohr@google.com> Fri Jan 10 10:55:50 2025 -0800
committer Patrick Rohr <prohr@google.com> Fri Jan 10 14:46:54 2025 -0800
tree 950c348c47122bbaabad89b5e1be1e56188b5a51
parent 77df9d34839057406de49c5d1a731b36af87a569

Add L2capNetworkSpecifier to blanket offer

The blanket offer is used to respond to reservation requests and only
serves ROLE_SERVER networks, as ROLE_CLIENT networks are not reserved.

Test: TH
Change-Id: I9ed00a76fa0d61caf27e321ea17260fb12b69600

service/src/com/android/server/L2capNetworkProvider.java

diff --git a/service/src/com/android/server/L2capNetworkProvider.java b/service/src/com/android/server/L2capNetworkProvider.java
index 463a76f..24d2746 100644
--- a/service/src/com/android/server/L2capNetworkProvider.java
+++ b/service/src/com/android/server/L2capNetworkProvider.java
@@ -16,6 +16,7 @@
 
 package com.android.server;
 
+import static android.net.L2capNetworkSpecifier.ROLE_SERVER;
 import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_CONGESTED;
 import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_METERED;
 import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_ROAMING;
@@ -28,6 +29,7 @@
 
 import android.content.Context;
 import android.net.ConnectivityManager;
+import android.net.L2capNetworkSpecifier;
 import android.net.NetworkCapabilities;
 import android.net.NetworkProvider;
 import android.net.NetworkProvider.NetworkOfferCallback;
@@ -61,6 +63,9 @@
         // Note the missing NET_CAPABILITY_NOT_RESTRICTED marking the network as restricted.
         public static final NetworkCapabilities CAPABILITIES;
         static {
+            final L2capNetworkSpecifier l2capNetworkSpecifier = new L2capNetworkSpecifier.Builder()
+                    .setRole(ROLE_SERVER)
+                    .build();
             NetworkCapabilities caps = NetworkCapabilities.Builder.withoutDefaultCapabilities()
                     .addTransportType(TRANSPORT_BLUETOOTH)
                     .addCapability(NET_CAPABILITY_NOT_CONGESTED)
@@ -69,6 +74,7 @@
                     .addCapability(NET_CAPABILITY_NOT_SUSPENDED)
                     .addCapability(NET_CAPABILITY_NOT_VCN_MANAGED)
                     .addCapability(NET_CAPABILITY_NOT_VPN)
+                    .setNetworkSpecifier(l2capNetworkSpecifier)
                     .build();
             caps.setReservationId(RES_ID_MATCH_ALL_RESERVATIONS);
             CAPABILITIES = caps;