commit eabaff1c7f02906e568997bdd7dc43006655387e
author Arthur Ishiguro <arthuri@google.com> Mon Jun 25 11:31:33 2018 -0700
committer android-build-team Robot <android-build-team-robot@google.com> Fri Aug 10 20:28:10 2018 +0000
tree 2db016451e52090825b4bd77ff72b288dc8c0ba6
parent faf2dc95bf26fb075039ed3ee7623e83a281c6dd

Resolve inconsistent parcel read in NanoAppFilter

Bug: 77599679
Test: Compile only
Change-Id: Ib417a5cb4d51744442d2fb14437cabbe5fd1c266
(cherry picked from commit abe5a73a4a81e312a1690fbc10a6b99ce98b699a)

core/java/android/hardware/location/NanoAppFilter.java

diff --git a/core/java/android/hardware/location/NanoAppFilter.java b/core/java/android/hardware/location/NanoAppFilter.java
index bf35a3d..c440949 100644
--- a/core/java/android/hardware/location/NanoAppFilter.java
+++ b/core/java/android/hardware/location/NanoAppFilter.java
@@ -83,7 +83,7 @@
         mAppId = in.readLong();
         mAppVersion = in.readInt();
         mVersionRestrictionMask = in.readInt();
-        mAppIdVendorMask = in.readInt();
+        mAppIdVendorMask = in.readLong();
     }
 
     public int describeContents() {
@@ -91,7 +91,6 @@
     }
 
     public void writeToParcel(Parcel out, int flags) {
-
         out.writeLong(mAppId);
         out.writeInt(mAppVersion);
         out.writeInt(mVersionRestrictionMask);