diff options
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/binder/Parcel.cpp | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/libs/binder/Parcel.cpp b/libs/binder/Parcel.cpp index e30e65d1c5..9ca3c06b15 100644 --- a/libs/binder/Parcel.cpp +++ b/libs/binder/Parcel.cpp @@ -17,41 +17,40 @@ #define LOG_TAG "Parcel" //#define LOG_NDEBUG 0 -#include <binder/Parcel.h> +#include <errno.h> +#include <inttypes.h> +#include <stdint.h> +#include <stdio.h> +#include <stdlib.h> +#include <sys/mman.h> -#include <binder/IPCThreadState.h> #include <binder/Binder.h> #include <binder/BpBinder.h> +#include <binder/IPCThreadState.h> +#include <binder/Parcel.h> #include <binder/ProcessState.h> #include <binder/Status.h> #include <binder/TextOutput.h> -#include <errno.h> +#include <cutils/ashmem.h> #include <utils/Debug.h> +#include <utils/Flattenable.h> #include <utils/Log.h> +#include <utils/misc.h> #include <utils/String8.h> #include <utils/String16.h> -#include <utils/misc.h> -#include <utils/Flattenable.h> -#include <cutils/ashmem.h> #include <private/binder/binder_module.h> #include <private/binder/Static.h> -#include <inttypes.h> -#include <stdio.h> -#include <stdlib.h> -#include <stdint.h> -#include <sys/mman.h> - #ifndef INT32_MAX #define INT32_MAX ((int32_t)(2147483647)) #endif #define LOG_REFS(...) -//#define LOG_REFS(...) ALOG(LOG_DEBUG, "Parcel", __VA_ARGS__) +//#define LOG_REFS(...) ALOG(LOG_DEBUG, LOG_TAG, __VA_ARGS__) #define LOG_ALLOC(...) -//#define LOG_ALLOC(...) ALOG(LOG_DEBUG, "Parcel", __VA_ARGS__) +//#define LOG_ALLOC(...) ALOG(LOG_DEBUG, LOG_TAG, __VA_ARGS__) // --------------------------------------------------------------------------- @@ -171,15 +170,15 @@ static void release_object(const sp<ProcessState>& proc, return; } case BINDER_TYPE_FD: { - if (outAshmemSize != NULL) { - if (obj.cookie != 0) { + if (obj.cookie != 0) { // owned + if (outAshmemSize != NULL) { int size = ashmem_get_size_region(obj.handle); if (size > 0) { *outAshmemSize -= size; } - - close(obj.handle); } + + close(obj.handle); } return; } |