[automerger] Fix security hole in GateKeeperResponse. am: e74cae8f7c am: b1141b6ff0 am: 1cd9e8096f am: 6dfc8d8d4d am: a3c1de7e49 am: 4acf4fabf4 am: 40317127f4

am: 159cd14334 Change-Id: Iaed779900e094a5951e24771ed1f1f55b0c1b014
2017-08-15 20:42:11 +00:00
parent facc5e40fc 159cd14334
commit 24587d57cf
1 changed files with 2 additions and 0 deletions
--- a/core/java/android/service/gatekeeper/GateKeeperResponse.java
+++ b/core/java/android/service/gatekeeper/GateKeeperResponse.java
@@ -85,6 +85,8 @@ public final class GateKeeperResponse implements Parcelable {
            if (mPayload != null) {
                dest.writeInt(mPayload.length);
                dest.writeByteArray(mPayload);
+            } else {
+                dest.writeInt(0);
            }
        }
    }