Merge "adb: check for and report inotify_init1 failure." am: 41ee55a875 am: 95a3a2fc3d

am: 22ce93df4a

Change-Id: Id1264323d851f6f59f24d3a0dbc23eb5bccc4d8a
This commit is contained in:
Josh Gao 2017-01-21 01:17:36 +00:00 committed by android-build-merger
commit b1d8b8811a
1 changed files with 6 additions and 0 deletions

View File

@ -388,7 +388,13 @@ static void adb_auth_inotify_update(int fd, unsigned fd_event, void*) {
static void adb_auth_inotify_init(const std::set<std::string>& paths) {
LOG(INFO) << "adb_auth_inotify_init...";
int infd = inotify_init1(IN_CLOEXEC | IN_NONBLOCK);
if (infd < 0) {
PLOG(ERROR) << "failed to create inotify fd";
return;
}
for (const std::string& path : paths) {
int wd = inotify_add_watch(infd, path.c_str(), IN_CREATE | IN_MOVED_TO);
if (wd < 0) {