Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 90529d212a

Change-Id: I81362fcea24b7bf160854c972500f3e63b032330
This commit is contained in:
Primiano Tucci
2018-01-30 18:38:41 +00:00
committed by android-build-merger
parent 0ad9dfaef9 90529d212a
commit 13d6ac4a35
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libs/services/src/os/DropBoxManager.cpp
View File

@@ -185,6 +185,11 @@ DropBoxManager::addFile(const String16& tag, const string& filename, int flags)
Status Status
DropBoxManager::addFile(const String16& tag, int fd, int flags) 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); Entry entry(tag, flags, fd);
return add(entry); return add(entry);
} }
@@ -201,4 +206,3 @@ DropBoxManager::add(const Entry& entry)
} }
}} // namespace android::os }} // namespace android::os