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-26 23:52:15 +0000
commit935288b1f40f8800fc7f703c36d52efd77517c08 (patch)
treee6f63c30fe76f808194cd0f43b9aa240bda457df
parent0d630464588846642c11ab53261ad140c4ab1856 (diff)
downloadbase-935288b1f40f8800fc7f703c36d52efd77517c08.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);
}
}
}