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

Commit 60d78f90 authored by Jakub Pawłowski's avatar Jakub Pawłowski Committed by Automerger Merge Worker
Browse files

Merge "Get rid of error log spam when connecting LE Audio device" am: 84b578dd am: 3fa0d5cc 

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



Change-Id: If59ae248fc7142b5e53a098cf05b0aa0fbcec0af
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 024d30b7 3fa0d5cc

android/app/src/com/android/bluetooth/btservice/storage/DatabaseManager.java

+4 −5
Original line number Diff line number Diff line
@@ -1254,19 +1254,18 @@ public class DatabaseManager { 
        String modelName = "";

        String hardwareVersion = "";

        String softwareVersion = "";

        String value = Utils.byteArrayToUtf8String(bytesValue);

        switch (key) {

            case BluetoothDevice.METADATA_MANUFACTURER_NAME:

                manufacturerName = value;

                manufacturerName = Utils.byteArrayToUtf8String(bytesValue);

                break;

            case BluetoothDevice.METADATA_MODEL_NAME:

                modelName = value;

                modelName = Utils.byteArrayToUtf8String(bytesValue);

                break;

            case BluetoothDevice.METADATA_HARDWARE_VERSION:

                hardwareVersion = value;

                hardwareVersion = Utils.byteArrayToUtf8String(bytesValue);

                break;

            case BluetoothDevice.METADATA_SOFTWARE_VERSION:

                softwareVersion = value;

                softwareVersion = Utils.byteArrayToUtf8String(bytesValue);

                break;

            default:

                // Do not log anything if metadata doesn't fall into above categories