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

Commit 22ce93df 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 

am: 95a3a2fc

Change-Id: Ifa14af07b422a764fcf9204343090540eea51089
parents d7db8378 95a3a2fc

adb/adb_auth_host.cpp

+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) {