commit 8bcd86e6626a38df525507cd25044cc9592b9b0d
author Yu-Han Yang <yuhany@google.com> Tue Sep 21 12:29:34 2021 -0700
committer Yu-Han Yang <yuhany@google.com> Wed Sep 22 01:48:57 2021 +0000
tree d9a519d655a85e8811149eaa1aa72d121f114066
parent 735bca53200b7c6c5a5393cd00457d5935bfebf6

Fix serialization bug in GpsNavigationMessage

Bug: 196970023
Test: presubmits passing.
Change-Id: I69f51eb2faac0cf2ee9f7a5f94f7100925f7221c

location/java/android/location/GpsNavigationMessage.java

diff --git a/location/java/android/location/GpsNavigationMessage.java b/location/java/android/location/GpsNavigationMessage.java
index 5c3c710..16ac26d 100644
--- a/location/java/android/location/GpsNavigationMessage.java
+++ b/location/java/android/location/GpsNavigationMessage.java
@@ -259,12 +259,8 @@
             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;
         }