commit abe5a73a4a81e312a1690fbc10a6b99ce98b699a
author Arthur Ishiguro <arthuri@google.com> Mon Jun 25 11:31:33 2018 -0700
committer Arthur Ishiguro <arthuri@google.com> Fri Jul 06 22:54:52 2018 +0000
tree 5e978a0d99ee4dabcda4c5d92c56c7519a7d7e77
parent 4bc1c2445ce6a6359095b54e46aaba6c7897c99f

Resolve inconsistent parcel read in NanoAppFilter

Bug: 77599679
Test: Compile only
Change-Id: Ib417a5cb4d51744442d2fb14437cabbe5fd1c266

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 8db70e9..90aecbe 100644
--- a/core/java/android/hardware/location/NanoAppFilter.java
+++ b/core/java/android/hardware/location/NanoAppFilter.java
@@ -82,7 +82,7 @@
         mAppId = in.readLong();
         mAppVersion = in.readInt();
         mVersionRestrictionMask = in.readInt();
-        mAppIdVendorMask = in.readInt();
+        mAppIdVendorMask = in.readLong();
     }
 
     public int describeContents() {
@@ -90,7 +90,6 @@
     }
 
     public void writeToParcel(Parcel out, int flags) {
-
         out.writeLong(mAppId);
         out.writeInt(mAppVersion);
         out.writeInt(mVersionRestrictionMask);