Merge "Merge sc-qpr1 to aosp-master - DO NOT MERGE"
This commit is contained in:
commit
db8910bf0c
1 changed files with 5 additions and 3 deletions
|
@ -29,7 +29,9 @@
|
|||
|
||||
#include <functional>
|
||||
#include <memory>
|
||||
#include <string>
|
||||
|
||||
#include <android-base/strings.h>
|
||||
#include <android-base/unique_fd.h>
|
||||
|
||||
#include "minui/minui.h"
|
||||
|
@ -118,12 +120,12 @@ static int inotify_cb(int fd, __unused uint32_t epevents) {
|
|||
}
|
||||
offset += sizeof(inotify_event) + pevent->len;
|
||||
|
||||
pevent->name[pevent->len] = '\0';
|
||||
if (strncmp(pevent->name, "event", 5)) {
|
||||
std::string event_name(pevent->name, pevent->len);
|
||||
if (!android::base::StartsWith(event_name, "event")) {
|
||||
continue;
|
||||
}
|
||||
|
||||
android::base::unique_fd dfd(openat(dirfd(dir.get()), pevent->name, O_RDONLY));
|
||||
android::base::unique_fd dfd(openat(dirfd(dir.get()), event_name.c_str(), O_RDONLY));
|
||||
if (dfd == -1) {
|
||||
break;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue