Merge "Fix an error on bootloadermessager test teardown" am: b694ba8aab am: 536989892c

am: b2dfc0182a

Change-Id: Ie4ee06310e7ea9c36e5323f4990f71f2f8fb771e
This commit is contained in:
Tianjie Xu
2017-03-03 21:56:10 +00:00
committed by android-build-merger
+4 -2
View File
@@ -33,8 +33,10 @@ class BootloaderMessageTest : public ::testing::Test {
virtual void TearDown() override {
// Clear the BCB.
std::string err;
ASSERT_TRUE(clear_bootloader_message(&err)) << "Failed to clear BCB: " << err;
if (has_misc) {
std::string err;
ASSERT_TRUE(clear_bootloader_message(&err)) << "Failed to clear BCB: " << err;
}
}
bool has_misc;