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

Commit d6066c83 authored by Michael Wachenschwanz's avatar Michael Wachenschwanz Committed by android-build-merger
Browse files

Merge "DO NOT MERGE Revert "WTF Logging for catching memory issue in Parcel"" into oc-dev 

am: 61e2b158

Change-Id: I6dc739ac35e8965b3a6ed84fe03d20c0441193c5
parents 95cf947f 61e2b158

core/java/android/os/Parcel.java

+1 −7
Original line number Diff line number Diff line
@@ -429,13 +429,7 @@ public final class Parcel { 
     * @param size The new number of bytes in the Parcel.

     */

    public final void setDataSize(int size) {

        // STOPSHIP: Try/catch for exception is for temporary debug. Remove once bug resolved

        try {

        updateNativeSize(nativeSetDataSize(mNativePtr, size));

        } catch (IllegalArgumentException iae) {

            Log.e(TAG,"Caught Exception representing a known bug in Parcel",iae);

            Log.wtfStack(TAG, "This flow is using SetDataSize incorrectly");

        }

    }



    /**

core/jni/android_os_Parcel.cpp

+1 −5
Original line number Diff line number Diff line
@@ -119,11 +119,7 @@ static jlong android_os_Parcel_setDataSize(JNIEnv* env, jclass clazz, jlong nati 
    Parcel* parcel = reinterpret_cast<Parcel*>(nativePtr);

    if (parcel != NULL) {

        const status_t err = parcel->setDataSize(size);

        //STOPSHIP: check for BADFLO is for a temporary debug using wtf. Remove once bug resolved.

        if (err == UNKNOWN_ERROR + 0xBADF10) {

            jniThrowExceptionFmt(env, "java/lang/IllegalArgumentException",

                         "Attempt to resize (size = %d) Parcel would corrupt object memory", size);

        } else if (err != NO_ERROR) {

        if (err != NO_ERROR) {

            signalExceptionForError(env, clazz, err);

        }

        return parcel->getOpenAshmemSize();