Merge "Opt out of gtest error if no binary found" into main
diff --git a/fs_mgr/fs_mgr_remount.cpp b/fs_mgr/fs_mgr_remount.cpp
index 79c0b6d..f91d232 100644
--- a/fs_mgr/fs_mgr_remount.cpp
+++ b/fs_mgr/fs_mgr_remount.cpp
@@ -171,11 +171,12 @@
}
if (show_help) {
show_help = false;
- std::cerr << "WARNING: Userdata checkpoint is in progress. To force end checkpointing, "
- "call 'vdc checkpoint commitChanges'. This can lead to data corruption if "
- "rolled back."
+ std::cerr << "WARNING: Userdata checkpoint is in progress. "
+ "To forcibly end checkpointing, "
+ "call 'vdc checkpoint commitChanges'. "
+ "This can lead to data corruption if rolled back."
<< std::endl;
- LOG(INFO) << "Waiting for checkpoint to complete and then continue remount.";
+ LOG(INFO) << "Waiting for checkpoint to complete before remounting...";
}
std::this_thread::sleep_for(4s);
}
diff --git a/libutils/CallStack_test.cpp b/libutils/CallStack_test.cpp
index 7afc2c3..bfe6b87 100644
--- a/libutils/CallStack_test.cpp
+++ b/libutils/CallStack_test.cpp
@@ -72,7 +72,8 @@
TEST(CallStackTest, log_stack) {
android::CallStack::logStack("callstack_test");
auto logger_list = android_logger_list_open(android_name_to_log_id("main"),
- ANDROID_LOG_NONBLOCK, 1000, getpid());
+ ANDROID_LOG_NONBLOCK,
+ 10000 /* tail */, getpid());
ASSERT_NE(nullptr, logger_list);
std::string log;
while (true) {