Revert "Mark blanket offer as transport primary"
This reverts commit 07bad0cf27bf11a068308b2f4b0c71986eee1584.
This change is not actually required. CS will match all matching offers
from the satisfying provider, no matter their score.
Test: TH
Change-Id: If3213856dc7c5f3f06f128f3d866bfa940e6af63
diff --git a/service/src/com/android/server/L2capNetworkProvider.java b/service/src/com/android/server/L2capNetworkProvider.java
index 57fd830..3f96856 100644
--- a/service/src/com/android/server/L2capNetworkProvider.java
+++ b/service/src/com/android/server/L2capNetworkProvider.java
@@ -111,12 +111,10 @@
* requests that do not have a NetworkSpecifier set.
*/
private class BlanketReservationOffer implements NetworkOfferCallback {
- // Set as transport primary to ensure that the BlanketReservationOffer always outscores the
- // ReservedServerOffer, because as soon as the BlanketReservationOffer receives an
- // onNetworkUnneeded() callback, it will tear down the associated reserved offer.
- public static final NetworkScore SCORE = new NetworkScore.Builder()
- .setTransportPrimary(true)
- .build();
+ // TODO: ensure that once the incoming request is satisfied, the blanket offer does not get
+ // unneeded. This means the blanket offer must always outscore the reserved offer. This
+ // might require setting the blanket offer as setTransportPrimary().
+ public static final NetworkScore SCORE = new NetworkScore.Builder().build();
// Note the missing NET_CAPABILITY_NOT_RESTRICTED marking the network as restricted.
public static final NetworkCapabilities CAPABILITIES;
static {