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

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

Merge "Pretty print profile names in BluetoothDatabase" into tm-dev am: 4524092d 

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



Change-Id: I15ea318a5443beff7aed35798400586c7d3eb384
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4e5f5848 4524092d

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

+2 −1
Original line number Diff line number Diff line
@@ -377,7 +377,8 @@ public class DatabaseManager { 
            Metadata data = mMetadataCache.get(address);

            int connectionPolicy = data.getProfileConnectionPolicy(profile);



            Log.v(TAG, "getProfileConnectionPolicy: xx:xx:xx:xx:xx:xx, profile=" + profile

            Log.v(TAG, "getProfileConnectionPolicy: xx:xx:xx:xx:xx:xx, profile="

                    + BluetoothProfile.getProfileName(profile)

                    + ", connectionPolicy = " + connectionPolicy);

            return connectionPolicy;

        }

framework/java/android/bluetooth/BluetoothProfile.java

+14 −0
Original line number Diff line number Diff line
@@ -485,8 +485,22 @@ public interface BluetoothProfile { 
                return "HEARING_AID";

            case LE_AUDIO:

                return "LE_AUDIO";

            case VOLUME_CONTROL:

                return "VOLUME_CONTROL";

            case MCP_SERVER:

                return "MCP_SERVER";

            case CSIP_SET_COORDINATOR:

                return "CSIP_SET_COORDINATOR";

            case LE_AUDIO_BROADCAST:

                return "LE_AUDIO_BROADCAST";

            case LE_CALL_CONTROL:

                return "LE_CALL_CONTROL";

            case HAP_CLIENT:

                return "HAP_CLIENT";

            case LE_AUDIO_BROADCAST_ASSISTANT:

                return "LE_AUDIO_BROADCAST_ASSISTANT";

            case BATTERY:

                return "BATTERY";

            default:

                return "UNKNOWN_PROFILE";

        }