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

Update Region.cpp to use AParcel NDK APIs

Browse Source 
Test: CtsGraphicsTestCases
Bug: 145227478
Change-Id: I36f5d3e760bce3c302277c7897c7f8df0ac3cb61
This commit is contained in:
Derek Sollenberger
2020-02-14 14:16:34 -05:00
parent ee538a3a85
commit 15da7e24a5
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libs/hwui/Android.bp
View File

@@ -288,7 +288,6 @@ cc_defaults {
"jni/PathEffect.cpp",
"jni/PathMeasure.cpp",
"jni/Picture.cpp",
"jni/Region.cpp",
"jni/Shader.cpp",
"jni/Typeface.cpp",
"jni/Utils.cpp",
@@ -334,6 +333,7 @@ cc_defaults {
"jni/GraphicsStatsService.cpp",
"jni/Movie.cpp",
"jni/MovieImpl.cpp",
"jni/Region.cpp", // requires libbinder_ndk
"jni/pdf/PdfDocument.cpp",
"jni/pdf/PdfEditor.cpp",
"jni/pdf/PdfRenderer.cpp",
@@ -341,6 +341,7 @@ cc_defaults {
],
shared_libs: [
"libandroidfw",
"libbinder_ndk",
"libmediandk",
"libnativedisplay",
"libnativewindow",

20
libs/hwui/jni/Region.cpp
View File

@@ -19,10 +19,10 @@
#include "GraphicsJNI.h"
#ifdef __ANDROID__ // Layoutlib does not support parcel
#include <binder/Parcel.h>
#include <android/binder_parcel.h>
#include <android/binder_parcel_jni.h>
#include <android/binder_parcel_utils.h>
#endif
#include "android_os_Parcel.h"
#include "android_util_Binder.h"
namespace android {
@@ -207,10 +207,11 @@ static jlong Region_createFromParcel(JNIEnv* env, jobject clazz, jobject parcel)
return 0;
}
android::Parcel* p = android::parcelForJavaObject(env, parcel);
std::vector<int32_t> rects;
p->readInt32Vector(&rects);
AParcel* p = AParcel_fromJavaParcel(env, parcel);
ndk::AParcel_readVector(p, &rects);
AParcel_delete(p);
if ((rects.size() % 4) != 0) {
return 0;
@@ -235,8 +236,6 @@ static jboolean Region_writeToParcel(JNIEnv* env, jobject clazz, jlong regionHan
return JNI_FALSE;
}
android::Parcel* p = android::parcelForJavaObject(env, parcel);
std::vector<int32_t> rects;
SkRegion::Iterator it(*region);
while (!it.done()) {
@@ -248,7 +247,10 @@ static jboolean Region_writeToParcel(JNIEnv* env, jobject clazz, jlong regionHan
it.next();
}
p->writeInt32Vector(rects);
AParcel* p = AParcel_fromJavaParcel(env, parcel);
ndk::AParcel_writeVector(p, rects);
AParcel_delete(p);
return JNI_TRUE;
#else
return JNI_FALSE;