Merge "Fix serialization bug in GpsNavigationMessage" into rvc-qpr-dev am: c2c72dae24 am: c46a977d82

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

Change-Id: If5443a8c72311fe58f8bc75164a9c3f4da3861a2
This commit is contained in:
TreeHugger Robot
2021-09-30 00:23:13 +00:00
committed by Automerger Merge Worker

View File

@@ -262,12 +262,8 @@ public class GpsNavigationMessage implements Parcelable {
parcel.readByteArray(data);
navigationMessage.setData(data);
if (parcel.dataAvail() >= Integer.SIZE) {
int status = parcel.readInt();
navigationMessage.setStatus((short) status);
} else {
navigationMessage.setStatus(STATUS_UNKNOWN);
}
int status = parcel.readInt();
navigationMessage.setStatus((short) status);
return navigationMessage;
}