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

Merge "DropBoxManager: Allow adding a file using an fd"

Browse Source 
am: a946cc9f53

Change-Id: Ie7a7071264cb91d26eb380b3155a5ed71667fb46
This commit is contained in:
Primiano Tucci
2018-01-26 19:18:24 +00:00
committed by android-build-merger
parent c4905215cb a946cc9f53
commit 71411b877a
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libs/services/include/android/os/DropBoxManager.h
View File

@@ -58,6 +58,10 @@ public:
// are required from the system process. Returns NULL if the file can't be opened. // are required from the system process. Returns NULL if the file can't be opened.
Status addFile(const String16& tag, const string& filename, int flags); Status addFile(const String16& tag, const string& filename, int flags);
// Create a new Entry from an already opened file. Takes ownership of the
// file descriptor.
Status addFile(const String16& tag, int fd, int flags);
class Entry : public virtual RefBase, public Parcelable { class Entry : public virtual RefBase, public Parcelable {
public: public:
Entry(); Entry();

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

@@ -179,7 +179,12 @@ DropBoxManager::addFile(const String16& tag, const string& filename, int flags)
ALOGW("DropboxManager: %s", message.c_str()); ALOGW("DropboxManager: %s", message.c_str());
return Status::fromExceptionCode(Status::EX_ILLEGAL_STATE, message.c_str()); return Status::fromExceptionCode(Status::EX_ILLEGAL_STATE, message.c_str());
} }
return addFile(tag, fd, flags);
}
Status
DropBoxManager::addFile(const String16& tag, int fd, int flags)
{
Entry entry(tag, flags, fd); Entry entry(tag, flags, fd);
return add(entry); return add(entry);
} }