commit 1813302b7eb1d616de0b896c196756dff5af7e12
author Fyodor Kupolov <fkupolov@google.com> Fri Nov 17 00:51:34 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Nov 17 00:51:34 2017 +0000
tree b8e848907d1e62196d7e721fa3c7835284f5987b
parent 69600966976587bc8ec7d29f93bd9d4362de4503
parent d9ac3741922a58b17aec730ba113f44efb8b6600

Merge "Provide remote stack trace information"

libs/binder/Status.cpp

diff --git a/libs/binder/Status.cpp b/libs/binder/Status.cpp
index 006f7f9..a9d5055 100644
--- a/libs/binder/Status.cpp
+++ b/libs/binder/Status.cpp
@@ -102,6 +102,15 @@
     }
     mMessage = String8(message);
 
+    // Skip over the remote stack trace data
+    int32_t remote_stack_trace_header_size;
+    status = parcel.readInt32(&remote_stack_trace_header_size);
+    if (status != OK) {
+        setFromStatusT(status);
+        return status;
+    }
+    parcel.setDataPosition(parcel.dataPosition() + remote_stack_trace_header_size);
+
     if (mException == EX_SERVICE_SPECIFIC) {
         status = parcel.readInt32(&mErrorCode);
     } else if (mException == EX_PARCELABLE) {
@@ -137,6 +146,7 @@
         return status;
     }
     status = parcel->writeString16(String16(mMessage));
+    status = parcel->writeInt32(0); // Empty remote stack trace header
     if (mException == EX_SERVICE_SPECIFIC) {
         status = parcel->writeInt32(mErrorCode);
     } else if (mException == EX_PARCELABLE) {