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

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

Snap for 12224018 from ee15ddd2 to 24Q4-release 

Change-Id: I603d4f403a4aa3b9b99510caeff59cc1ebd44e72
parents dc241a70 ee15ddd2

android/app/src/com/android/bluetooth/le_scan/ScanManager.java

+5 −5
Original line number Diff line number Diff line
@@ -712,9 +712,9 @@ public class ScanManager { 
            Log.d(

                    TAG,

                    "Scan mode update during screen off from "

                            + client.scanModeApp

                            + getScanModeString(client.scanModeApp)

                            + " to "

                            + updatedScanMode);

                            + getScanModeString(updatedScanMode));

            return client.updateScanMode(updatedScanMode);

        }
@@ -828,9 +828,9 @@ public class ScanManager { 
            Log.d(

                    TAG,

                    "Scan mode update during screen on from "

                            + client.scanModeApp

                            + getScanModeString(client.scanModeApp)

                            + " to "

                            + getMinScanMode(scanMode, maxScanMode));

                            + getScanModeString(getMinScanMode(scanMode, maxScanMode)));

            return client.updateScanMode(getMinScanMode(scanMode, maxScanMode));

        }
@@ -2104,7 +2104,7 @@ public class ScanManager { 
                            + " isForeground "

                            + isForeground

                            + " scanMode "

                            + client.settings.getScanMode());

                            + getScanModeString(client.settings.getScanMode()));

        }



        if (updatedScanParams) {

flags/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ aconfig_declarations { 
        "ranging.aconfig",

        "rfcomm.aconfig",

        "rnr.aconfig",

        "sco.aconfig",

        "sdp.aconfig",

        "security.aconfig",

        "sockets.aconfig",

flags/BUILD.gn

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ aconfig("bluetooth_flags_c_lib") { 
    "ranging.aconfig",

    "rfcomm.aconfig",

    "rnr.aconfig",

    "sco.aconfig",

    "sdp.aconfig",

    "security.aconfig",

    "sockets.aconfig",

flags/sco.aconfig

0 → 100644
+12 −0
Original line number Diff line number Diff line 
package: "com.android.bluetooth.flags"

container: "com.android.btservices"



flag {

    name: "fix_sco_command_status_handling"

    namespace: "bluetooth"

    description: "Make sure to properly handle Command Status error when SCO is creating"

    bug: "358573137"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}
 
 No newline at end of file

system/audio_bluetooth_hw/device_port_proxy.cc

+2 −4
Original line number Diff line number Diff line
@@ -576,8 +576,7 @@ void BluetoothAudioPortAidl::UpdateSourceMetadata(const source_metadata_v7* sour 
            static_cast<AudioUsage>(source_metadata->tracks[i].base.usage);

    hal_source_metadata.tracks[i].contentType =

            static_cast<AudioContentType>(source_metadata->tracks[i].base.content_type);

    hal_source_metadata.tracks[i].tags =

            std::move(CovertAudioTagFromV7(source_metadata->tracks[i].tags));

    hal_source_metadata.tracks[i].tags = CovertAudioTagFromV7(source_metadata->tracks[i].tags);

  }



  BluetoothAudioSessionControl::UpdateSourceMetadata(session_type_, hal_source_metadata);
@@ -601,8 +600,7 @@ void BluetoothAudioPortAidl::UpdateSinkMetadata(const sink_metadata_v7* sink_met 
    hal_sink_metadata.tracks[i].source =

            static_cast<AudioSource>(sink_metadata->tracks[i].base.source);

    hal_sink_metadata.tracks[i].gain = sink_metadata->tracks[i].base.gain;

    hal_sink_metadata.tracks[i].tags =

            std::move(CovertAudioTagFromV7(sink_metadata->tracks[i].tags));

    hal_sink_metadata.tracks[i].tags = CovertAudioTagFromV7(sink_metadata->tracks[i].tags);

  }



  BluetoothAudioSessionControl::UpdateSinkMetadata(session_type_, hal_sink_metadata);