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

Merge "Don't throw TransactionTooLargeException for small payloads" into mnc-dev

Browse Source
This commit is contained in:
Christopher Tate
2015-06-25 22:28:01 +00:00
committed by Android (Google) Code Review
parent d5b18387ab 02ca7a7db0
commit 9a60072553
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
core/jni/android_util_Binder.cpp
View File

@@ -682,18 +682,28 @@ void signalExceptionForError(JNIEnv* env, jobject obj, status_t err,
break; break;
case FAILED_TRANSACTION: { case FAILED_TRANSACTION: {
ALOGE("!!! FAILED BINDER TRANSACTION !!! (parcel size = %d)", parcelSize); ALOGE("!!! FAILED BINDER TRANSACTION !!! (parcel size = %d)", parcelSize);
const char* exceptionToThrow;
char msg[128]; char msg[128];
snprintf(msg, sizeof(msg)-1, "data parcel size %d bytes", parcelSize);
// TransactionTooLargeException is a checked exception, only throw from certain methods. // TransactionTooLargeException is a checked exception, only throw from certain methods.
// FIXME: Transaction too large is the most common reason for FAILED_TRANSACTION // FIXME: Transaction too large is the most common reason for FAILED_TRANSACTION
// but it is not the only one. The Binder driver can return BR_FAILED_REPLY // but it is not the only one. The Binder driver can return BR_FAILED_REPLY
// for other reasons also, such as if the transaction is malformed or // for other reasons also, such as if the transaction is malformed or
// refers to an FD that has been closed. We should change the driver // refers to an FD that has been closed. We should change the driver
// to enable us to distinguish these cases in the future. // to enable us to distinguish these cases in the future.
jniThrowException(env, canThrowRemoteException if (canThrowRemoteException && parcelSize > 200*1024) {
? "android/os/TransactionTooLargeException" // bona fide large payload
: "java/lang/RuntimeException", exceptionToThrow = "android/os/TransactionTooLargeException";
parcelSize > 0 ? msg : NULL); snprintf(msg, sizeof(msg)-1, "data parcel size %d bytes", parcelSize);
} else {
// Heuristic: a payload smaller than this threshold "shouldn't" be too
// big, so it's probably some other, more subtle problem. In practice
// it nearly always means that the remote process died while the binder
// transaction was already in flight.
exceptionToThrow = "java/lang/RuntimeException";
snprintf(msg, sizeof(msg)-1,
"Transaction failed on small parcel; remote process probably died");
}
jniThrowException(env, exceptionToThrow, msg);
} break; } break;
case FDS_NOT_ALLOWED: case FDS_NOT_ALLOWED:
jniThrowException(env, "java/lang/RuntimeException", jniThrowException(env, "java/lang/RuntimeException",