Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f2d12d4b authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge "Parcel: remove use of getOpenAshmemSize" am: 8cb9efdb am: ddf85ed3 am: 7622b6af 

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

Change-Id: Ib7216aaee6b23a0691495f27fe043582448d4269
parents 8c7faff4 7622b6af

core/jni/android_os_Parcel.cpp

+3 −6
Original line number Diff line number Diff line
@@ -596,13 +596,10 @@ static jint android_os_Parcel_compareData(JNIEnv* env, jclass clazz, jlong thisN 
                                          jlong otherNativePtr)

{

    Parcel* thisParcel = reinterpret_cast<Parcel*>(thisNativePtr);

    if (thisParcel == NULL) {

       return 0;

    }

    LOG_ALWAYS_FATAL_IF(thisParcel == nullptr, "Should not be null");



    Parcel* otherParcel = reinterpret_cast<Parcel*>(otherNativePtr);

    if (otherParcel == NULL) {

       return thisParcel->getOpenAshmemSize();

    }

    LOG_ALWAYS_FATAL_IF(otherParcel == nullptr, "Should not be null");



    return thisParcel->compareData(*otherParcel);

}