diff options
author | Yifan Hong <elsk@google.com> | 2018-12-19 23:34:41 +0100 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-12-19 23:34:41 +0100 |
commit | 081c05f39576ec9d59eba7077b6f60caa0b85c64 (patch) | |
tree | 76db008013c3391d38836ec3b09fd8d5449e5cb9 /recovery.cpp | |
parent | Move parts of roots.cpp to libfs_mgr am: 0f339e27bb (diff) | |
parent | Merge changes from topic "vintf_object_recovery_mount" (diff) | |
download | android_bootable_recovery-081c05f39576ec9d59eba7077b6f60caa0b85c64.tar android_bootable_recovery-081c05f39576ec9d59eba7077b6f60caa0b85c64.tar.gz android_bootable_recovery-081c05f39576ec9d59eba7077b6f60caa0b85c64.tar.bz2 android_bootable_recovery-081c05f39576ec9d59eba7077b6f60caa0b85c64.tar.lz android_bootable_recovery-081c05f39576ec9d59eba7077b6f60caa0b85c64.tar.xz android_bootable_recovery-081c05f39576ec9d59eba7077b6f60caa0b85c64.tar.zst android_bootable_recovery-081c05f39576ec9d59eba7077b6f60caa0b85c64.zip |
Diffstat (limited to '')
-rw-r--r-- | recovery.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/recovery.cpp b/recovery.cpp index de916c633..703923e81 100644 --- a/recovery.cpp +++ b/recovery.cpp @@ -294,7 +294,7 @@ bool SetUsbConfig(const std::string& state) { // Returns the selected filename, or an empty string. static std::string browse_directory(const std::string& path, Device* device) { - ensure_path_mounted(path.c_str()); + ensure_path_mounted(path); std::unique_ptr<DIR, decltype(&closedir)> d(opendir(path.c_str()), closedir); if (!d) { @@ -578,7 +578,7 @@ static void choose_recovery_file(Device* device) { log_file += "." + std::to_string(i); } - if (ensure_path_mounted(log_file.c_str()) == 0 && access(log_file.c_str(), R_OK) == 0) { + if (ensure_path_mounted(log_file) == 0 && access(log_file.c_str(), R_OK) == 0) { entries.push_back(std::move(log_file)); } }; @@ -842,7 +842,7 @@ static Device::BuiltinAction prompt_and_wait(Device* device, int status) { } case Device::MOUNT_SYSTEM: // the system partition is mounted at /mnt/system - if (ensure_path_mounted_at(get_system_root().c_str(), "/mnt/system") != -1) { + if (ensure_path_mounted_at(get_system_root(), "/mnt/system") != -1) { ui->Print("Mounted /system.\n"); } break; |