diff options
| author | Meng-hsuan Chung <menghsuan@google.com> | 2020-03-18 06:54:50 -0700 |
|---|---|---|
| committer | Meng-hsuan Chung <menghsuan@google.com> | 2020-03-18 09:24:06 -0700 |
| commit | ac919221decde31a84f65f6d21f6f2db49986142 (patch) | |
| tree | d3068078b0523fbff539c342f546d8f2f149e523 /core | |
| parent | 17886f57fa7105208d852fe43e9b4b7fe1834c2c (diff) | |
| download | chre-ac919221decde31a84f65f6d21f6f2db49986142.tar.gz | |
Fix run_test.sh errors
Bug: 151814911
Bug: 144184490
Test: ./run_tests.sh and verify tests pass
Change-Id: If0198522508256afae380baead6eb5bf5a802527
Diffstat (limited to 'core')
| -rw-r--r-- | core/gnss_manager.cc | 9 | ||||
| -rw-r--r-- | core/settings.cc | 4 |
2 files changed, 8 insertions, 5 deletions
diff --git a/core/gnss_manager.cc b/core/gnss_manager.cc index f3ed886e..03a98444 100644 --- a/core/gnss_manager.cc +++ b/core/gnss_manager.cc @@ -58,7 +58,8 @@ bool getReportEventType(SystemCallbackType callbackType, uint16_t *eventType) { break; } default: { - LOGE("Unknown callback type %" PRIu16, callbackType); + LOGE("Unknown callback type %" PRIu16, + static_cast<uint16_t>(callbackType)); success = false; } } @@ -196,11 +197,13 @@ void GnssSession::handleLocationSettingChange(SettingState state) { if (chreEnable || chreDisable) { if (controlPlatform(chreEnable, mCurrentInterval, Milliseconds(0) /* minTimeToNext */)) { - LOGD("Configured GNSS %s: setting state %" PRIu8, mName, state); + LOGD("Configured GNSS %s: setting state %" PRIu8, mName, + static_cast<uint8_t>(state)); addSessionRequestLog(CHRE_INSTANCE_ID, mCurrentInterval, chreEnable); mInternalRequestPending = true; } else { - LOGE("Failed to configure GNSS %s: setting state %" PRIu8, mName, state); + LOGE("Failed to configure GNSS %s: setting state %" PRIu8, mName, + static_cast<uint8_t>(state)); } } } diff --git a/core/settings.cc b/core/settings.cc index 71250d86..c4d78e3b 100644 --- a/core/settings.cc +++ b/core/settings.cc @@ -47,7 +47,7 @@ bool getIndexForSetting(Setting setting, size_t *index) { void setSettingState(Setting setting, SettingState state) { size_t index; if (!getIndexForSetting(setting, &index)) { - LOGE("Unknown setting %" PRIu8, setting); + LOGE("Unknown setting %" PRIu8, static_cast<uint8_t>(setting)); } else { gSettingStateList[index] = state; } @@ -103,7 +103,7 @@ SettingState getSettingState(Setting setting) { return gSettingStateList[index]; } - LOGE("Unknown setting %" PRIu8, setting); + LOGE("Unknown setting %" PRIu8, static_cast<uint8_t>(setting)); return SettingState::SETTING_STATE_MAX; } |