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

am eaec64c8: am 8c6750ff: Merge "Fixes for Region_writeToParcel." into mnc-dev

Browse Source 
* commit 'eaec64c83703c0c28e18cb2fe602f359454e672a':
  Fixes for Region_writeToParcel.
This commit is contained in:
Leon Scroggins III
2015-06-18 13:23:07 +00:00
committed by Android Git Automerger
parent cfb5b615b9 eaec64c837
commit 0b98ac2def
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/jni/android/graphics/Region.cpp
View File

@@ -231,15 +231,24 @@ static jlong Region_createFromParcel(JNIEnv* env, jobject clazz, jobject parcel)
static jboolean Region_writeToParcel(JNIEnv* env, jobject clazz, jlong regionHandle, jobject parcel)
{
const SkRegion* region = reinterpret_cast<SkRegion*>(regionHandle);
if (parcel == NULL) {
if (parcel == nullptr) {
return JNI_FALSE;
}
android::Parcel* p = android::parcelForJavaObject(env, parcel);
size_t size = region->writeToMemory(NULL);
const size_t size = region->writeToMemory(nullptr);
p->writeInt32(size);
region->writeToMemory(p->writeInplace(size));
void* dst = p->writeInplace(size);
if (dst == nullptr) {
ALOGE("Region.writeToParcel could not write %zi bytes", size);
return JNI_FALSE;
}
const size_t sizeWritten = region->writeToMemory(dst);
if (sizeWritten != size) {
ALOGE("SkRegion::writeToMemory should have written %zi bytes but wrote %zi",
size, sizeWritten);
}
return JNI_TRUE;
}