post-rebase fixes

apps/bench.py

@@ -1537,11 +1537,6 @@ def create_role_factory(ctx, default_role):
     type=int,
     help='RFComm credits threshold',
 )
-@click.option(
-    '--rfcomm-send-credits-threshold',
-    type=int,
-    help='RFComm send credits threshold',
-)
 @click.option(
     '--l2cap-psm',
     type=int,

bumble/rfcomm.py

@@ -737,8 +737,11 @@ class DLC(EventEmitter):
         return (
             f'DLC(dlci={self.dlci}, '
             f'state={self.state.name}, '
-            f'max_frame_size={self.max_frame_size}, '
-            f'window_size={self.window_size}'
+            f'rx_max_frame_size={self.rx_max_frame_size}, '
+            f'rx_credits={self.rx_credits}, '
+            f'rx_max_credits={self.rx_max_credits}, '
+            f'tx_max_frame_size={self.tx_max_frame_size}, '
+            f'tx_credits={self.tx_credits}'
             ')'
         )
 

extras/android/BtBench/app/src/main/java/com/github/google/bumble/btbench/Model.kt

@@ -150,7 +150,8 @@ class AppViewModel : ViewModel() {
         } else if (senderPacketSizeSlider < 0.5F) {
             512
         } else if (senderPacketSizeSlider < 0.7F) {
-            1024
+            // 970 is a value that works well on Android.
+            970
         } else if (senderPacketSizeSlider < 0.9F) {
             2048
         } else {