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

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

Change-Id: I9030e8cced0b2b9879b377d9f3e62aed50022ccb
This commit is contained in:
TreeHugger Robot 2021-09-30 00:11:52 +00:00 committed by Automerger Merge Worker
commit c46a977d82

View File

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