| commit | 5811ae4ae71afae2fe30ea3b6e9ee9a8795a3973 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Dec 01 18:08:52 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Dec 01 18:08:52 2020 +0000 |
| tree | c564588cc42cdc81b7c242bfa4a80f2b35b6c036 | |
| parent | e8725fd5084f2f624937df7f85a2ccdf562a7ffb [diff] | |
| parent | 935aef6d7868d75fdc6fbe4e096d73aa83319355 [diff] |
Merge "Convert mask types from uint32_t to enum type" am: 1f551d879a am: 935aef6d78 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1510239 Change-Id: I8260afa68f1b0b481cf8de6c14ed3bbda6c2302a
diff --git a/audio/core/all-versions/default/Conversions.cpp b/audio/core/all-versions/default/Conversions.cpp index eddff55..0b6ad80 100644 --- a/audio/core/all-versions/default/Conversions.cpp +++ b/audio/core/all-versions/default/Conversions.cpp
@@ -31,7 +31,7 @@ // HAL assumes that the address is NUL-terminated. char halAddress[AUDIO_DEVICE_MAX_ADDRESS_LEN]; memset(halAddress, 0, sizeof(halAddress)); - uint32_t halDevice = static_cast<uint32_t>(address.device); + audio_devices_t halDevice = static_cast<audio_devices_t>(address.device); if (getAudioDeviceOutAllA2dpSet().count(halDevice) > 0 || halDevice == AUDIO_DEVICE_IN_BLUETOOTH_A2DP) { snprintf(halAddress, sizeof(halAddress), "%02X:%02X:%02X:%02X:%02X:%02X",