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

Commit 9b830c3b authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 11973804 from 12b5cbaf to 24Q3-release 

Change-Id: Ib472290d2cb32745dbaa0bd59c0477e0646d8278
parents eb8d4628 12b5cbaf

android/app/src/com/android/bluetooth/gatt/GattService.java

+1 −1
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ public class GattService extends ProfileService { 
    @Override

    public void stop() {

        Log.d(TAG, "stop()");

        if (Flags.scanManagerRefactor() && sGattService != null) {

        if (Flags.scanManagerRefactor() && sGattService == null) {

            Log.w(TAG, "stop() called before start()");

            return;

        }

flags/leaudio.aconfig

+10 −0
Original line number Diff line number Diff line
@@ -375,3 +375,13 @@ flag { 
        purpose: PURPOSE_BUGFIX

    }

}



flag {

    name: "leaudio_big_depends_on_audio_state"

    namespace: "bluetooth"

    description: "BIG creation/termination depends on audio resume/pause"

    bug: "347204335"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}

flags/rnr.aconfig

+0 −7
Original line number Diff line number Diff line 
package: "com.android.bluetooth.flags"

container: "com.android.btservices"



flag {

    name: "rnr_cancel_before_event_race"

    namespace: "bluetooth"

    description: "Address race condition when rnr cancel and event arrive close together"

    bug: "316037290"

}



flag {

    name: "rnr_present_during_service_discovery"

    namespace: "bluetooth"

floss/pandora/floss/floss_enums.py

+1 −0
Original line number Diff line number Diff line
@@ -136,6 +136,7 @@ class BtStatus(enum.IntEnum): 
    BT_STATUS_TIMEOUT = 15

    DEVICE_NOT_FOUND = 16

    UNEXPECTED_STATE = 17

    SOCKET_ERROR = 18





class SocketType(enum.IntEnum):

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

+1 −0
Original line number Diff line number Diff line
@@ -133,6 +133,7 @@ public class GattServerConnectWithScanTest { 


    @Test

    @RequiresFlagsEnabled(Flags.FLAG_BLE_GATT_SERVER_USE_ADDRESS_TYPE_IN_CONNECTION)

    @Ignore("b/343749428: Remove hidden api's dependencies to enable the test.")

    public void serverConnectToPublicAddress_withTransportAuto() throws Exception {

        String publicAddress = mBumble.getRemoteDevice().getAddress();

        advertiseWithBumble(OwnAddressType.PUBLIC);