summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorMichael Wachenschwanz <mwachens@google.com>2019-06-05 17:07:58 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-06-05 17:07:58 -0700
commit1c8a632ad22a442351f29375cd52b118942a37d5 (patch)
treeebce07ffd4d690ecdfb8116c1206f64ec8d6692f /core/java
parent66785eeba5abe9f5988a4759ed2f5de973c5acd0 (diff)
parent2ca66d4d10f3a293c45c3d69e5b27a68841addc4 (diff)
[automerger] Clear the Parcel before writing an exception during a transaction am: f8ef5bcf21 am: 86c9bdd251 am: 6d72c0681f am: d944d907df am: 31737b4618
am: 2ca66d4d10 Change-Id: I452bc18a9cebc417e7c4499c2bebf8fd3cc0f1ce
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/os/Binder.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/os/Binder.java b/core/java/android/os/Binder.java
index ff0bc69ed325..b9e21196c73d 100644
--- a/core/java/android/os/Binder.java
+++ b/core/java/android/os/Binder.java
@@ -683,6 +683,8 @@ public class Binder implements IBinder {
Log.w(TAG, "Caught a RuntimeException from the binder stub implementation.", e);
}
} else {
+ // Clear the parcel before writing the exception
+ reply.setDataSize(0);
reply.setDataPosition(0);
reply.writeException(e);
}