| commit | 02131b53858f9854b0bf141a783e89a75922aa95 | [log] [tgz] |
|---|---|---|
| author | David Drysdale <drysdale@google.com> | Fri Oct 11 08:08:46 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 11 08:08:46 2024 +0000 |
| tree | e9c6b15a040f064e114cf93b3f874417ee408118 | |
| parent | 2b7faed499487cd147d234418fd35cf2a3fefb3e [diff] | |
| parent | 25876eb8d16e19d8c748f5271e8f0d8394ac54e5 [diff] |
Merge "KeyMint: coalesce device ID failure code" into main am: 25876eb8d1 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3304723 Change-Id: I67d0edb74d1845c5e60544dc519675635cac4ec3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/automotive/ivn_android_device/impl/default/src/IvnAndroidDeviceService.cpp b/automotive/ivn_android_device/impl/default/src/IvnAndroidDeviceService.cpp index 81f18b2..b284205 100644 --- a/automotive/ivn_android_device/impl/default/src/IvnAndroidDeviceService.cpp +++ b/automotive/ivn_android_device/impl/default/src/IvnAndroidDeviceService.cpp
@@ -24,6 +24,7 @@ #include <json/json.h> #include <fstream> +#include <string> namespace android { namespace hardware { @@ -48,7 +49,8 @@ } bool IvnAndroidDeviceService::init() { - std::ifstream configStream(mConfigPath); + std::string configPathStr(mConfigPath); + std::ifstream configStream(configPathStr); if (!configStream) { LOG(ERROR) << "couldn't open " << mConfigPath << " for parsing."; return false;