diff options
| author | Chen Chen <cncn@google.com> | 2023-02-27 18:35:49 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2023-02-27 18:35:49 +0000 |
| commit | 5b689ffa3f30266d8726e76ac006a44a6eb73f9c (patch) | |
| tree | c0cd87a4ec5e0dc94f469f3aa8d9c667fb47ebae | |
| parent | f92283eed2d737e50ea2ceb3b17e41e877747b9f (diff) | |
| parent | 14ef5e58a493b196683fbae5dd397651fa68a538 (diff) | |
Merge "BluetoothMetrics: cast parameters for BluetoothLocalVersionsReported to avoid compiler ambiguity" into tm-qpr-dev
| -rw-r--r-- | system/gd/os/android/metrics.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/system/gd/os/android/metrics.cc b/system/gd/os/android/metrics.cc index eacaa727bc..400e92587a 100644 --- a/system/gd/os/android/metrics.cc +++ b/system/gd/os/android/metrics.cc @@ -443,7 +443,12 @@ void LogMetricBluetoothLocalVersions( uint8_t hci_version, uint32_t hci_revision) { int ret = stats_write( - BLUETOOTH_LOCAL_VERSIONS_REPORTED, lmp_manufacturer_name, lmp_version, lmp_subversion, hci_version, hci_revision); + BLUETOOTH_LOCAL_VERSIONS_REPORTED, + static_cast<int32_t>(lmp_manufacturer_name), + static_cast<int32_t>(lmp_version), + static_cast<int32_t>(lmp_subversion), + static_cast<int32_t>(hci_version), + static_cast<int32_t>(hci_revision)); if (ret < 0) { LOG_WARN( "Failed for LogMetricBluetoothLocalVersions, " |