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

am: 536989892c

Change-Id: I457f30c36fde0dd407a9684fbc7c2d68ac2b94c0
This commit is contained in:
Tianjie Xu 2017-03-03 21:53:10 +00:00 committed by android-build-merger
commit b2dfc0182a

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;