PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "bootloader_message: Remove global std::string" am: 7b87949ae1 am: 76d80ba102

Browse Source 
am: 8946524a79

Change-Id: I65d24597138563a61bc259246e5940948afb1158
This commit is contained in:
Vic Yang
2019-08-07 19:07:51 -07:00
committed by android-build-merger
parent 05fa10519d 8946524a79
commit e858e2fe81
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
bootloader_message/bootloader_message.cpp
View File

@@ -20,6 +20,7 @@
#include <fcntl.h>
#include <string.h>
#include <optional>
#include <string>
#include <string_view>
#include <vector>
@@ -37,7 +38,7 @@
using android::fs_mgr::Fstab;
using android::fs_mgr::ReadDefaultFstab;
static std::string g_misc_device_for_test;
static std::optional<std::string> g_misc_device_for_test;
// Exposed for test purpose.
void SetMiscBlockDeviceForTest(std::string_view misc_device) {
@@ -45,8 +46,8 @@ void SetMiscBlockDeviceForTest(std::string_view misc_device) {
}
static std::string get_misc_blk_device(std::string* err) {
if (!g_misc_device_for_test.empty()) {
return g_misc_device_for_test;
if (g_misc_device_for_test.has_value() && !g_misc_device_for_test->empty()) {
return *g_misc_device_for_test;
}
Fstab fstab;
if (!ReadDefaultFstab(&fstab)) {