Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 95a3a2fc authored by Josh Gao's avatar Josh Gao Committed by android-build-merger
Browse files

Merge "adb: check for and report inotify_init1 failure."

am: 41ee55a8

Change-Id: I5454f46e519aa7b9660f1ec98f445e6d820808e0
parents f83489c0 41ee55a8
Loading
Loading
Loading
Loading
+6 −0
Original line number Diff line number Diff line
@@ -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) {