ScoopDroid/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

auto import from //branches/cupcake/...@127101

Browse source
This commit is contained in:
The Android Open Source Project 2009-01-20 14:03:58 -08:00 • committed by Alex Ray
parent 046e40caa0
commit 7976caad7d
2 changed files with 75 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
include/utils/Parcel.h
View file

@ -17,6 +17,7 @@
#ifndef ANDROID_PARCEL_H
#define ANDROID_PARCEL_H
#include <cutils/native_handle.h>
#include <utils/Errors.h>
#include <utils/RefBase.h>
#include <utils/String16.h>
@ -78,6 +79,9 @@ public:
status_t writeString16(const char16_t* str, size_t len);
status_t writeStrongBinder(const sp<IBinder>& val);
status_t writeWeakBinder(const wp<IBinder>& val);
// doesn't take ownership of the native_handle
status_t writeNativeHandle(const native_handle& handle);
// Place a file descriptor into the parcel. The given fd must remain
// valid for the lifetime of the parcel.
@ -108,6 +112,15 @@ public:
const char16_t* readString16Inplace(size_t* outLen) const;
sp<IBinder> readStrongBinder() const;
wp<IBinder> readWeakBinder() const;
// if alloc is NULL, native_handle is allocated with malloc(), otherwise
// alloc is used. If the function fails, the effects of alloc() must be
// reverted by the caller.
native_handle* readNativeHandle(
native_handle* (*alloc)(void* cookie, int numFds, int ints),
void* cookie) const;
// Retrieve a file descriptor from the parcel. This returns the raw fd
// in the parcel, which you do not own -- use dup() to get your own copy.

63
libs/utils/Parcel.cpp
View file

@ -650,6 +650,26 @@ status_t Parcel::writeWeakBinder(const wp<IBinder>& val)
return flatten_binder(ProcessState::self(), val, this);
}
status_t Parcel::writeNativeHandle(const native_handle& handle)
{
if (handle.version != sizeof(native_handle))
return BAD_TYPE;
status_t err;
err = writeInt32(handle.numFds);
if (err != NO_ERROR) return err;
err = writeInt32(handle.numInts);
if (err != NO_ERROR) return err;
for (int i=0 ; err==NO_ERROR && i<handle.numFds ; i++)
err = writeDupFileDescriptor(handle.data[i]);
err = write(handle.data + handle.numFds, sizeof(int)*handle.numInts);
return err;
}
status_t Parcel::writeFileDescriptor(int fd)
{
flat_binder_object obj;
@ -902,6 +922,47 @@ wp<IBinder> Parcel::readWeakBinder() const
return val;
}
native_handle* Parcel::readNativeHandle(native_handle* (*alloc)(void*, int, int), void* cookie) const
{
int numFds, numInts;
status_t err;
err = readInt32(&numFds);
if (err != NO_ERROR) return 0;
err = readInt32(&numInts);
if (err != NO_ERROR) return 0;
native_handle* h;
if (alloc == 0) {
size_t size = sizeof(native_handle) + sizeof(int)*(numFds + numInts);
h = (native_handle*)malloc(size);
h->version = sizeof(native_handle);
h->numFds = numFds;
h->numInts = numInts;
} else {
h = alloc(cookie, numFds, numInts);
if (h->version != sizeof(native_handle)) {
return 0;
}
}
for (int i=0 ; err==NO_ERROR && i<numFds ; i++) {
h->data[i] = readFileDescriptor();
if (h->data[i] < 0) err = BAD_VALUE;
}
err = read(h->data + numFds, sizeof(int)*numInts);
if (err != NO_ERROR) {
if (alloc == 0) {
free(h);
}
h = 0;
}
return h;
}
int Parcel::readFileDescriptor() const
{
const flat_binder_object* flat = readObject(true);
@ -923,7 +984,7 @@ const flat_binder_object* Parcel::readObject(bool nullMetaData) const
= reinterpret_cast<const flat_binder_object*>(mData+DPOS);
mDataPos = DPOS + sizeof(flat_binder_object);
if (!nullMetaData && (obj->cookie == NULL && obj->binder == NULL)) {
// When transfering a NULL object, we don't write it into
// When transferring a NULL object, we don't write it into
// the object list, so we don't want to check for it when
// reading.
LOGV("readObject Setting data pos of %p to %d\n", this, mDataPos);