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

Merge "Clarify ownership for NativeHandle::mHandle"

Browse source
This commit is contained in:
Wonsik Kim 2014-04-02 06:13:58 +00:00 • committed by Android (Google) Code Review
commit 94404eef65
2 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
include/utils/NativeHandle.h
View file

@ -26,9 +26,11 @@ namespace android {
class NativeHandle: public LightRefBase<NativeHandle> {
public:
// Create a refcounted wrapper around a native_handle_t.
// Create a refcounted wrapper around a native_handle_t, and declare
// whether the wrapper owns the handle (so that it should clean up the
// handle upon destruction) or not.
// If handle is NULL, no NativeHandle will be created.
static sp<NativeHandle> create(native_handle_t* handle);
static sp<NativeHandle> create(native_handle_t* handle, bool ownsHandle);
const native_handle_t* handle() const {
return mHandle;
@ -38,10 +40,11 @@ private:
// for access to the destructor
friend class LightRefBase<NativeHandle>;
NativeHandle(native_handle_t* handle);
NativeHandle(native_handle_t* handle, bool ownsHandle);
virtual ~NativeHandle();
native_handle_t* mHandle;
bool mOwnsHandle;
// non-copyable
NativeHandle(const NativeHandle&);

15
libutils/NativeHandle.cpp
View file

@ -19,17 +19,20 @@
namespace android {
sp<NativeHandle> NativeHandle::create(native_handle_t* handle) {
return handle ? new NativeHandle(handle) : NULL;
sp<NativeHandle> NativeHandle::create(
native_handle_t* handle, bool ownsHandle) {
return handle ? new NativeHandle(handle, ownsHandle) : NULL;
}
NativeHandle::NativeHandle(native_handle_t* handle)
: mHandle(handle)
NativeHandle::NativeHandle(native_handle_t* handle, bool ownsHandle)
: mHandle(handle), mOwnsHandle(ownsHandle)
{}
NativeHandle::~NativeHandle() {
native_handle_close(mHandle);
native_handle_delete(mHandle);
if (mOwnsHandle) {
native_handle_close(mHandle);
native_handle_delete(mHandle);
}
}
} // namespace android