ADHOC
/
replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

resolved conflicts for merge of c1ced8bb to master 

Change-Id: I83db00ff986ace8a1c77648738b93124613ddfc0
This commit is contained in:
Dan Albert 2014-11-20 15:16:22 -08:00
parent 47513e8739 c1ced8bbcd
commit 325c4c9aa7
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/binder/Binder.cpp
View File

@ -72,7 +72,7 @@ public:
BBinder::BBinder()
{
atomic_init(&mExtras, 0);
atomic_init(&mExtras, static_cast<uintptr_t>(0));
}
bool BBinder::isBinderAlive() const

2
libs/binder/Parcel.cpp
View File

@ -1438,7 +1438,7 @@ void Parcel::ipcSetDataReference(const uint8_t* data, size_t dataSize,
for (size_t i = 0; i < mObjectsSize; i++) {
binder_size_t offset = mObjects[i];
if (offset < minOffset) {
ALOGE("%s: bad object offset %"PRIu64" < %"PRIu64"\n",
ALOGE("%s: bad object offset %" PRIu64 " < %" PRIu64 "\n",
__func__, (uint64_t)offset, (uint64_t)minOffset);
mObjectsSize = 0;
break;