diff options
| author | Vic Yang <victoryang@google.com> | 2019-08-08 03:47:47 +0200 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-08-08 03:47:47 +0200 |
| commit | 76d80ba102dcb9b0b741d528b16f4c8a866cc29f (patch) | |
| tree | c93d4001c5aa39e601f10ce60babdb5a769f1caa | |
| parent | Merge "Simulator: add the argument to keep the updated images" (diff) | |
| parent | Merge "bootloader_message: Remove global std::string" (diff) | |
| download | android_bootable_recovery-76d80ba102dcb9b0b741d528b16f4c8a866cc29f.tar android_bootable_recovery-76d80ba102dcb9b0b741d528b16f4c8a866cc29f.tar.gz android_bootable_recovery-76d80ba102dcb9b0b741d528b16f4c8a866cc29f.tar.bz2 android_bootable_recovery-76d80ba102dcb9b0b741d528b16f4c8a866cc29f.tar.lz android_bootable_recovery-76d80ba102dcb9b0b741d528b16f4c8a866cc29f.tar.xz android_bootable_recovery-76d80ba102dcb9b0b741d528b16f4c8a866cc29f.tar.zst android_bootable_recovery-76d80ba102dcb9b0b741d528b16f4c8a866cc29f.zip | |
| -rw-r--r-- | bootloader_message/bootloader_message.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/bootloader_message/bootloader_message.cpp b/bootloader_message/bootloader_message.cpp index e684abbad..b15a9b9fd 100644 --- a/bootloader_message/bootloader_message.cpp +++ b/bootloader_message/bootloader_message.cpp @@ -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)) { |