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

Merge "Fix error message being cut off."

Browse Source
This commit is contained in:
Christopher Ferris
2022-11-07 22:47:48 +00:00
committed by Gerrit Code Review
parent a8438682f7 7fe5182312
commit 6a62b29a8b
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/jni/android_util_Binder.cpp
View File

@@ -25,6 +25,7 @@
#include <inttypes.h> #include <inttypes.h>
#include <mutex> #include <mutex>
#include <stdio.h> #include <stdio.h>
#include <string>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/types.h> #include <sys/types.h>
#include <unistd.h> #include <unistd.h>
@@ -880,7 +881,7 @@ void signalExceptionForError(JNIEnv* env, jobject obj, status_t err,
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; const char* exceptionToThrow;
char msg[128]; std::string msg;
// TransactionTooLargeException is a checked exception, only throw from certain methods. // TransactionTooLargeException is a checked exception, only throw from certain methods.
// TODO(b/28321379): Transaction size is the most common cause for FAILED_TRANSACTION // TODO(b/28321379): Transaction size is the most common cause 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
@@ -890,7 +891,7 @@ void signalExceptionForError(JNIEnv* env, jobject obj, status_t err,
if (canThrowRemoteException && parcelSize > 200*1024) { if (canThrowRemoteException && parcelSize > 200*1024) {
// bona fide large payload // bona fide large payload
exceptionToThrow = "android/os/TransactionTooLargeException"; exceptionToThrow = "android/os/TransactionTooLargeException";
snprintf(msg, sizeof(msg)-1, "data parcel size %d bytes", parcelSize); msg = base::StringPrintf("data parcel size %d bytes", parcelSize);
} else { } else {
// Heuristic: a payload smaller than this threshold "shouldn't" be too // Heuristic: a payload smaller than this threshold "shouldn't" be too
// big, so it's probably some other, more subtle problem. In practice // big, so it's probably some other, more subtle problem. In practice
@@ -899,11 +900,10 @@ void signalExceptionForError(JNIEnv* env, jobject obj, status_t err,
exceptionToThrow = (canThrowRemoteException) exceptionToThrow = (canThrowRemoteException)
? "android/os/DeadObjectException" ? "android/os/DeadObjectException"
: "java/lang/RuntimeException"; : "java/lang/RuntimeException";
snprintf(msg, sizeof(msg) - 1, msg = "Transaction failed on small parcel; remote process probably died, but "
"Transaction failed on small parcel; remote process probably died, but " "this could also be caused by running out of binder buffer space";
"this could also be caused by running out of binder buffer space");
} }
jniThrowException(env, exceptionToThrow, msg); jniThrowException(env, exceptionToThrow, msg.c_str());
} break; } break;
case FDS_NOT_ALLOWED: case FDS_NOT_ALLOWED:
jniThrowException(env, "java/lang/RuntimeException", jniThrowException(env, "java/lang/RuntimeException",