summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRubin Xu <rubinxu@google.com>2018-02-07 08:10:08 +0000
committerTim Schumacher <timschumi@gmx.de>2018-04-06 19:16:48 +0200
commitc1a53bc372bf946db98cab98e269721b3c816455 (patch)
tree0585bf131abf74912f83b3faec0fa7f908bcb1d2
parentbffbc485c5558748e811ef6f0cc6e974b9fe9dd3 (diff)
downloadframeworks_base-c1a53bc372bf946db98cab98e269721b3c816455.tar.gz
frameworks_base-c1a53bc372bf946db98cab98e269721b3c816455.tar.bz2
frameworks_base-c1a53bc372bf946db98cab98e269721b3c816455.zip
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 48109ca347a..c4d91e021af 100644
--- a/core/java/com/android/internal/widget/VerifyCredentialResponse.java
+++ b/core/java/com/android/internal/widget/VerifyCredentialResponse.java
@@ -95,6 +95,8 @@ public final class VerifyCredentialResponse implements Parcelable {
if (mPayload != null) {
dest.writeInt(mPayload.length);
dest.writeByteArray(mPayload);
+ } else {
+ dest.writeInt(0);
}
}
}