summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRubin Xu <rubinxu@google.com>2018-02-07 08:10:08 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2018-02-08 04:11:44 +0000
commit09ba8fdffd9c8d74fdc6bfb51bcebc27fc43884a (patch)
tree83a0578d4dead888c3780e940f2491ed16cef9fb
parenta4e80ee2cdae43fb92d3560924bce5e33cdb9c4c (diff)
downloadbase-09ba8fdffd9c8d74fdc6bfb51bcebc27fc43884a.tar.gz
Fix VerifyCredentialResponse parcelling code
There was an asymmetry between parcelling and unparcelling of VerifyCredentialResponse that could lead to type confusion if packed with other objects in a Parcel. Test: none Bug: 71714464 Change-Id: Icff68879e249422ccca49f2bb7db85c35b4cb353 (cherry picked from commit 54813e988884f0d604d5358569f10feda8622f46)
-rw-r--r--core/java/com/android/internal/widget/VerifyCredentialResponse.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/com/android/internal/widget/VerifyCredentialResponse.java b/core/java/com/android/internal/widget/VerifyCredentialResponse.java
index ad6020c0846c..7d1c70647092 100644
--- a/core/java/com/android/internal/widget/VerifyCredentialResponse.java
+++ b/core/java/com/android/internal/widget/VerifyCredentialResponse.java
@@ -98,6 +98,8 @@ public final class VerifyCredentialResponse implements Parcelable {
if (mPayload != null) {
dest.writeInt(mPayload.length);
dest.writeByteArray(mPayload);
+ } else {
+ dest.writeInt(0);
}
}
}