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

Commit 32c74da4 authored by Rongxuan Liu's avatar Rongxuan Liu Committed by Android (Google) Code Review
Browse files

Merge "[audio sharing] Update StreamMetadata element name" into main

parents acc3c859 650ed6fb

packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothLeBroadcastMetadataExt.kt

+9 −9
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ object BluetoothLeBroadcastMetadataExt { 
    private const val KEY_BT_ADVERTISER_ADDRESS = "AD"

    private const val KEY_BT_BROADCAST_ID = "BI"

    private const val KEY_BT_BROADCAST_CODE = "BC"

    private const val KEY_BT_STREAM_METADATA = "MD"

    private const val KEY_BT_PUBLIC_METADATA = "PM"

    private const val KEY_BT_STANDARD_QUALITY = "SQ"

    private const val KEY_BT_HIGH_QUALITY = "HQ"
@@ -84,7 +84,7 @@ object BluetoothLeBroadcastMetadataExt { 
        }

        if (this.publicBroadcastMetadata != null &&

                this.publicBroadcastMetadata?.rawMetadata?.size != 0) {

            entries.add(Pair(KEY_BT_STREAM_METADATA, Base64.encodeToString(

            entries.add(Pair(KEY_BT_PUBLIC_METADATA, Base64.encodeToString(

                this.publicBroadcastMetadata?.rawMetadata, Base64.NO_WRAP)))

        }

        if ((this.audioConfigQuality and
@@ -160,7 +160,7 @@ object BluetoothLeBroadcastMetadataExt { 
        var sourceAdvertiserSid = -1

        var broadcastId = -1

        var broadcastName: String? = null

        var streamMetadata: BluetoothLeAudioContentMetadata? = null

        var publicMetadata: BluetoothLeAudioContentMetadata? = null

        var paSyncInterval = -1

        var broadcastCode: ByteArray? = null

        var audioConfigQualityStandard = -1
@@ -207,11 +207,11 @@ object BluetoothLeBroadcastMetadataExt { 
                    broadcastCode = Base64.decode(value.dropLastWhile { it.equals(0.toByte()) }

                            .toByteArray(), Base64.NO_WRAP)

                }

                KEY_BT_STREAM_METADATA -> {

                    require(streamMetadata == null) {

                        "Duplicate streamMetadata $input"

                KEY_BT_PUBLIC_METADATA -> {

                    require(publicMetadata == null) {

                        "Duplicate publicMetadata $input"

                    }

                    streamMetadata = BluetoothLeAudioContentMetadata

                    publicMetadata = BluetoothLeAudioContentMetadata

                        .fromRawBytes(Base64.decode(value, Base64.NO_WRAP))

                }

                KEY_BT_STANDARD_QUALITY -> {
@@ -256,7 +256,7 @@ object BluetoothLeBroadcastMetadataExt { 
        Log.d(TAG, "parseQrCodeToMetadata: main data elements sourceAddrType=$sourceAddrType, " +

                "sourceAddr=$sourceAddrString, sourceAdvertiserSid=$sourceAdvertiserSid, " +

                "broadcastId=$broadcastId, broadcastName=$broadcastName, " +

                "streamMetadata=${streamMetadata != null}, " +

                "publicMetadata=${publicMetadata != null}, " +

                "paSyncInterval=$paSyncInterval, " +

                "broadcastCode=${broadcastCode?.toString(Charsets.UTF_8)}, " +

                "audioConfigQualityStandard=$audioConfigQualityStandard, " +
@@ -317,7 +317,7 @@ object BluetoothLeBroadcastMetadataExt { 
            setBroadcastName(broadcastName)

            // QR code should set PBP(public broadcast profile) for auracast

            setPublicBroadcast(true)

            setPublicBroadcastMetadata(streamMetadata)

            setPublicBroadcastMetadata(publicMetadata)

            setPaSyncInterval(paSyncInterval)

            setEncrypted(broadcastCode != null)

            setBroadcastCode(broadcastCode)

packages/SettingsLib/tests/unit/src/com/android/settingslib/bluetooth/BluetoothLeBroadcastMetadataExtTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ class BluetoothLeBroadcastMetadataExtTest { 


        const val QR_CODE_STRING =

            "BLUETOOTH:UUID:184F;BN:VGVzdA==;AT:1;AD:00A1A1A1A1A1;BI:1E240;BC:VGVzdENvZGU=;" +

            "MD:BgNwVGVzdA==;AS:1;PI:A0;NS:1;BS:3;NB:2;SM:BQNUZXN0BARlbmc=;;"

            "PM:BgNwVGVzdA==;AS:1;PI:A0;NS:1;BS:3;NB:2;SM:BQNUZXN0BARlbmc=;;"

        const val QR_CODE_STRING_NON_ENCRYPTED =

            "BLUETOOTH:UUID:184F;BN:SG9ja2V5;AT:0;AD:AABBCC001122;BI:DE51E9;SQ:1;AS:1;PI:FFFF;" +

            "NS:1;BS:1;NB:1;;"