Merge "Fix serialization bug in GpsNavigationMessage" into sc-v2-dev am: d56d1a4152

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

Change-Id: Ib89af127de4218fba121c693603e15562d280ab1
This commit is contained in:
TreeHugger Robot
2021-09-30 00:07:19 +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;
}