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

Merge "Parcel: remove use of getOpenAshmemSize" am: 8cb9efdb74

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1850626

Change-Id: Id8892c8d5f122fff9bdf9ab26246447e84ba2d88
This commit is contained in:
Steven Moreland
2021-10-12 21:06:11 +00:00
committed by Automerger Merge Worker
parent 117570f57c 8cb9efdb74
commit ddf85ed33d
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/jni/android_os_Parcel.cpp
View File

@@ -596,13 +596,10 @@ static jint android_os_Parcel_compareData(JNIEnv* env, jclass clazz, jlong thisN
jlong otherNativePtr) jlong otherNativePtr)
{ {
Parcel* thisParcel = reinterpret_cast<Parcel*>(thisNativePtr); Parcel* thisParcel = reinterpret_cast<Parcel*>(thisNativePtr);
if (thisParcel == NULL) { LOG_ALWAYS_FATAL_IF(thisParcel == nullptr, "Should not be null");
return 0;
}
Parcel* otherParcel = reinterpret_cast<Parcel*>(otherNativePtr); Parcel* otherParcel = reinterpret_cast<Parcel*>(otherNativePtr);
if (otherParcel == NULL) { LOG_ALWAYS_FATAL_IF(otherParcel == nullptr, "Should not be null");
return thisParcel->getOpenAshmemSize();
}
return thisParcel->compareData(*otherParcel); return thisParcel->compareData(*otherParcel);
} }