Merge "add component metadata tag to CTS liblog test acses"
diff --git a/adb/adb_utils.h b/adb/adb_utils.h
index 20c63b3..11c0ec9 100644
--- a/adb/adb_utils.h
+++ b/adb/adb_utils.h
@@ -74,13 +74,18 @@
template <typename Fn>
void PopAll(Fn fn) {
- std::unique_lock<std::mutex> lock(mutex);
- cv.wait(lock, [this]() { return !queue.empty(); });
+ std::vector<T> popped;
- for (const T& t : queue) {
+ {
+ std::unique_lock<std::mutex> lock(mutex);
+ cv.wait(lock, [this]() { return !queue.empty(); });
+ popped = std::move(queue);
+ queue.clear();
+ }
+
+ for (const T& t : popped) {
fn(t);
}
- queue.clear();
}
};
diff --git a/adb/client/usb_libusb.cpp b/adb/client/usb_libusb.cpp
index 7e77b5e..b2fdc07 100644
--- a/adb/client/usb_libusb.cpp
+++ b/adb/client/usb_libusb.cpp
@@ -422,8 +422,10 @@
if (!it->second->device_handle) {
// If the handle is null, we were never able to open the device.
unregister_usb_transport(it->second.get());
+ usb_handles.erase(it);
+ } else {
+ // Closure of the transport will erase the usb_handle.
}
- usb_handles.erase(it);
}
}
diff --git a/fs_mgr/fs_mgr_format.cpp b/fs_mgr/fs_mgr_format.cpp
index 5705f93..a03d92c 100644
--- a/fs_mgr/fs_mgr_format.cpp
+++ b/fs_mgr/fs_mgr_format.cpp
@@ -86,13 +86,15 @@
static int format_f2fs(char *fs_blkdev)
{
- char * args[3];
+ char * args[5];
int pid;
int rc = 0;
- args[0] = (char *)"/sbin/mkfs.f2fs";
- args[1] = fs_blkdev;
- args[2] = (char *)0;
+ args[0] = (char *)"/system/bin/make_f2fs";
+ args[1] = (char *)"-f";
+ args[2] = (char *)"-O encrypt";
+ args[3] = fs_blkdev;
+ args[4] = (char *)0;
pid = fork();
if (pid < 0) {
@@ -100,7 +102,7 @@
}
if (!pid) {
/* This doesn't return */
- execv("/sbin/mkfs.f2fs", args);
+ execv(args[0], args);
exit(1);
}
for(;;) {