Commit ec7018fa authored Aug 15, 2017 by Charles He Committed by android-build-merger Aug 15, 2017

Merge "[automerger] Fix security hole in GateKeeperResponse. am: e74cae8f...

Merge "[automerger] Fix security hole in GateKeeperResponse. am: e74cae8f am: b1141b6f am: 1cd9e809 am: 6dfc8d8d am: a3c1de7e am: 4acf4fab am: 40317127 am: 159cd143 am: 24587d57 am: 0fa9328b am: 51ca9674" into oc-dr1-dev-plus-aosp
am: 5ee440bb

Change-Id: I7eb6f2d24a30f4f4374b6c77b8bf717ee14cdee3

core/java/android/service/gatekeeper/GateKeeperResponse.java

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -106,6 +106,8 @@ public final class GateKeeperResponse implements Parcelable {
	if (mPayload != null) {		if (mPayload != null) {
	dest.writeInt(mPayload.length);		dest.writeInt(mPayload.length);
	dest.writeByteArray(mPayload);		dest.writeByteArray(mPayload);
			} else {
			dest.writeInt(0);
	}		}
	}		}
	}		}