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

Merge "Use the root case to set remote stack trace for"

Browse Source
This commit is contained in:
Fyodor Kupolov
2017-11-27 22:14:38 +00:00
committed by Android (Google) Code Review
parent 97d43d525c 3b946f43a4
commit 31342ca615
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,6 +20,7 @@ import android.annotation.Nullable;
import android.text.TextUtils;
import android.util.ArrayMap;
import android.util.ArraySet;
import android.util.ExceptionUtils;
import android.util.Log;
import android.util.Size;
import android.util.SizeF;
@@ -1866,7 +1867,14 @@ public final class Parcel {
if (remoteStackTrace != null) {
RemoteException cause = new RemoteException(
"Remote stack trace:\n" + remoteStackTrace, null, false, false);
e.initCause(cause);
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);
}