commit dca80fea22fc71b0a1fc2c26af8daa2a3b65f2f6
author Yu-Han Yang <yuhany@google.com> Tue Sep 21 12:29:34 2021 -0700
committer Yu-Han Yang <yuhany@google.com> Tue Sep 21 17:34:08 2021 -0700
tree d866a37168a56cd616f25f89889a587e85634d54
parent 4b8d2c671b6f14386a63e8a205db8a144fa985e2

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 dc1e99f..2b978f7 100644
--- a/location/java/android/location/GpsNavigationMessage.java
+++ b/location/java/android/location/GpsNavigationMessage.java
@@ -262,12 +262,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;
         }