Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 38c561f5 authored by Charlie Boutier's avatar Charlie Boutier Committed by Automerger Merge Worker
Browse files

Merge changes I7809444b,I4f13c1e5 into main am: e504aa2b 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3196749



Change-Id: Ic631c398bd24e5ad8ca7bae21de77dedcfbdbe7d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 456d5eae e504aa2b

framework/tests/bumble/src/android/bluetooth/SdpClientTest.java

+3 −1
Original line number Diff line number Diff line
@@ -65,9 +65,11 @@ public class SdpClientTest { 
                        ParcelUuid[] parcelUuids =

                                intent.getParcelableArrayExtra(

                                        BluetoothDevice.EXTRA_UUID, ParcelUuid.class);

                        if (parcelUuids != null) {

                            mFutureIntent.set(Arrays.asList(parcelUuids));

                        }

                    }

                }

            };



    @Before

pandora/server/bumble_experimental/hid.py

+1 −1
Original line number Diff line number Diff line
@@ -347,7 +347,7 @@ def on_hid_control_point_write(_connection, value): 


# -----------------------------------------------------------------------------

def sdp_records():

    service_record_handle = 0x00010002

    service_record_handle = 0x00010006

    return {

        service_record_handle: [

            ServiceAttribute(

pandora/server/bumble_experimental/rfcomm.py

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ from pandora_experimental.rfcomm_pb2 import ( 
    TxResponse,

)



FIRST_SERVICE_RECORD_HANDLE = 0x00010000

FIRST_SERVICE_RECORD_HANDLE = 0x00010010





class RFCOMMService(RFCOMMServicer):