summaryrefslogtreecommitdiffstats
path: root/recovery.cpp
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2018-12-23 05:05:33 +0100
committerandroid-build-team Robot <android-build-team-robot@google.com>2018-12-23 05:05:33 +0100
commit62227b544593de0dc079012f7436e24241065bd9 (patch)
treee6e5f3752c7618eab6de1a3f85f3a709c6fd2e95 /recovery.cpp
parentSnap for 5189750 from faf656f3a798495dafe9c60ec219835b7f78cf8b to qt-release (diff)
parentMerge "Add a horizontal line at the end of the graphic menu" am: fc0665c701 am: 095b6858dd (diff)
downloadandroid_bootable_recovery-62227b544593de0dc079012f7436e24241065bd9.tar
android_bootable_recovery-62227b544593de0dc079012f7436e24241065bd9.tar.gz
android_bootable_recovery-62227b544593de0dc079012f7436e24241065bd9.tar.bz2
android_bootable_recovery-62227b544593de0dc079012f7436e24241065bd9.tar.lz
android_bootable_recovery-62227b544593de0dc079012f7436e24241065bd9.tar.xz
android_bootable_recovery-62227b544593de0dc079012f7436e24241065bd9.tar.zst
android_bootable_recovery-62227b544593de0dc079012f7436e24241065bd9.zip
Diffstat (limited to 'recovery.cpp')
-rw-r--r--recovery.cpp6
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;