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

Change-Id: Ia0d267bb2013d7ddfe26dddfa35f3f396cca7f20
2017-08-15 17:51:58 +00:00
parent 6acee639af b1141b6ff0
commit 1cd9e8096f
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);
            }
        }
    }