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

Merge "Fix reading exception from Parcel" into pi-dev

Browse Source
This commit is contained in:
Fyodor Kupolov
2018-04-04 19:13:21 +00:00
committed by Android (Google) Code Review
parent 657f173a6d 2214b828e5
commit e269a5ac62
1 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1857,26 +1857,7 @@ public final class Parcel {
int code = readExceptionCode();
if (code != 0) {
String msg = readString();
String remoteStackTrace = null;
final int remoteStackPayloadSize = readInt();
if (remoteStackPayloadSize > 0) {
remoteStackTrace = readString();
}
Exception e = createException(code, msg);
// Attach remote stack trace if availalble
if (remoteStackTrace != null) {
RemoteException cause = new RemoteException(
"Remote stack trace:\n" + remoteStackTrace, null, false, false);
try {
Throwable rootCause = ExceptionUtils.getRootCause(e);
if (rootCause != null) {
rootCause.initCause(cause);
}
} catch (RuntimeException ex) {
Log.e(TAG, "Cannot set cause " + cause + " for " + e, ex);
}
}
SneakyThrow.sneakyThrow(e);
readException(code, msg);
}
}
@@ -1921,7 +1902,26 @@ public final class Parcel {
* @param msg The exception message.
*/
public final void readException(int code, String msg) {
SneakyThrow.sneakyThrow(createException(code, msg));
String remoteStackTrace = null;
final int remoteStackPayloadSize = readInt();
if (remoteStackPayloadSize > 0) {
remoteStackTrace = readString();
}
Exception e = createException(code, msg);
// Attach remote stack trace if availalble
if (remoteStackTrace != null) {
RemoteException cause = new RemoteException(
"Remote stack trace:\n" + remoteStackTrace, null, false, false);
try {
Throwable rootCause = ExceptionUtils.getRootCause(e);
if (rootCause != null) {
rootCause.initCause(cause);
}
} catch (RuntimeException ex) {
Log.e(TAG, "Cannot set cause " + cause + " for " + e, ex);
}
}
SneakyThrow.sneakyThrow(e);
}
/**