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

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

Browse Source
This commit is contained in:
Michael Wachenschwanz
2017-05-19 18:27:10 +00:00
committed by Android (Google) Code Review
parent 1effe000b8 138bebf4c1
commit 61e2b15866
2 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/os/Parcel.java
View File

@@ -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");
}
updateNativeSize(nativeSetDataSize(mNativePtr, size));
}
/**

6
core/jni/android_os_Parcel.cpp
View File

@@ -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();