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

Commit 4307efc8 authored by Primiano Tucci's avatar Primiano Tucci Committed by android-build-merger
Browse files

Merge "DropboxManager: Add err message if passing an invalid fd to addFile()"... 

Merge "DropboxManager: Add err message if passing an invalid fd to addFile()" am: 90529d21 am: 13d6ac4a
am: 72b12e42

Change-Id: Icfe984f46cb6e6cdc216d7182285c7e55abe93ab
parents d32110ed 72b12e42

libs/services/src/os/DropBoxManager.cpp

+5 −1
Original line number Diff line number Diff line
@@ -208,6 +208,11 @@ DropBoxManager::addFile(const String16& tag, const string& filename, int flags) 
Status

DropBoxManager::addFile(const String16& tag, int fd, int flags)

{

    if (fd == -1) {

        string message("invalid fd (-1) passed to to addFile");

        ALOGW("DropboxManager: %s", message.c_str());

        return Status::fromExceptionCode(Status::EX_ILLEGAL_STATE, message.c_str());

    }

    Entry entry(tag, flags, fd);

    return add(entry);

}
@@ -235,4 +240,3 @@ DropBoxManager::getNextEntry(const String16& tag, long msec, Entry* entry) 
}



}} // namespace android::os