commit 6cc0b76e85cf4b19971ed78caa99c45b44ad3553
author Etan Cohen <etancohen@google.com> Wed Feb 07 22:41:26 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 07 22:41:26 2018 +0000
tree ac9388486ba097eab16c296a9faf339bd74956c1
parent 83cb35453fb981596e77e2957fe5776fc439250e
parent 8d2d052b61e88e32639dc498cebaaf836d959438

Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into cw-e-dev

* changes:
  [automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c am: 5f4d9350f4
  [automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c
  [RTT] ParcelableRttResults parcel code fix

core/java/com/android/internal/widget/VerifyCredentialResponse.java

diff --git a/core/java/com/android/internal/widget/VerifyCredentialResponse.java b/core/java/com/android/internal/widget/VerifyCredentialResponse.java
index 48109ca..c4d91e0 100644
--- a/core/java/com/android/internal/widget/VerifyCredentialResponse.java
+++ b/core/java/com/android/internal/widget/VerifyCredentialResponse.java
@@ -95,6 +95,8 @@
             if (mPayload != null) {
                 dest.writeInt(mPayload.length);
                 dest.writeByteArray(mPayload);
+            } else {
+                dest.writeInt(0);
             }
         }
     }