Merge "Fix security hole in GateKeeperResponse" into tm-dev am: f811f765de

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17221284

Change-Id: I3f7d1fdb7a3c23470b29f49ac89260a48b948af8
This commit is contained in:
Ayush Sharma
2022-03-21 09:16:35 +00:00
committed by Automerger Merge Worker

View File

@@ -105,7 +105,7 @@ public final class GateKeeperResponse implements Parcelable {
dest.writeInt(mTimeout); dest.writeInt(mTimeout);
} else if (mResponseCode == RESPONSE_OK) { } else if (mResponseCode == RESPONSE_OK) {
dest.writeInt(mShouldReEnroll ? 1 : 0); dest.writeInt(mShouldReEnroll ? 1 : 0);
if (mPayload != null) { if (mPayload != null && mPayload.length > 0) {
dest.writeInt(mPayload.length); dest.writeInt(mPayload.length);
dest.writeByteArray(mPayload); dest.writeByteArray(mPayload);
} else { } else {