[automerger] Fix security hole in GateKeeperResponse. am: e74cae8f7c am: b1141b6ff0 am: 1cd9e8096f

Change-Id: I2fce56d688cc0a4111668c695c9cf9b1c930faf8
2017-08-15 17:52:27 +00:00
parent 569af6584a 1cd9e8096f
commit 6dfc8d8d4d
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);
            }
        }
    }