diff options
| author | Tianjie Xu <xunchang@google.com> | 2019-07-17 19:59:41 +0200 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-07-17 19:59:41 +0200 |
| commit | 7aa310c3f561cf0b7c01c47c29422fa01f8b5796 (patch) | |
| tree | fa9e56486c748d3426dcf9ba3b92f8cfa281e1bf /updater/simulator_runtime.cpp | |
| parent | [automerger skipped] minadbd sends heartbeat to rescue service for getprop command. (diff) | |
| parent | Merge "Add command line parser for simulator" (diff) | |
| download | android_bootable_recovery-7aa310c3f561cf0b7c01c47c29422fa01f8b5796.tar android_bootable_recovery-7aa310c3f561cf0b7c01c47c29422fa01f8b5796.tar.gz android_bootable_recovery-7aa310c3f561cf0b7c01c47c29422fa01f8b5796.tar.bz2 android_bootable_recovery-7aa310c3f561cf0b7c01c47c29422fa01f8b5796.tar.lz android_bootable_recovery-7aa310c3f561cf0b7c01c47c29422fa01f8b5796.tar.xz android_bootable_recovery-7aa310c3f561cf0b7c01c47c29422fa01f8b5796.tar.zst android_bootable_recovery-7aa310c3f561cf0b7c01c47c29422fa01f8b5796.zip | |
Diffstat (limited to 'updater/simulator_runtime.cpp')
| -rw-r--r-- | updater/simulator_runtime.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/updater/simulator_runtime.cpp b/updater/simulator_runtime.cpp index c8718c71a..d2074d69a 100644 --- a/updater/simulator_runtime.cpp +++ b/updater/simulator_runtime.cpp @@ -87,7 +87,11 @@ int SimulatorRuntime::WipeBlockDevice(const std::string_view filename, size_t /* } bool SimulatorRuntime::ReadFileToString(const std::string_view filename, - std::string* /* content */) const { + std::string* content) const { + if (android::base::EndsWith(filename, "oem.prop")) { + return android::base::ReadFileToString(source_->GetOemSettings(), content); + } + LOG(INFO) << "SKip reading filename " << filename; return true; } |