summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArthur Ishiguro <arthuri@google.com>2018-06-25 11:31:33 -0700
committerandroid-build-team Robot <android-build-team-robot@google.com>2018-08-10 20:28:10 +0000
commiteabaff1c7f02906e568997bdd7dc43006655387e (patch)
tree2db016451e52090825b4bd77ff72b288dc8c0ba6
parentfaf2dc95bf26fb075039ed3ee7623e83a281c6dd (diff)
downloadbase-eabaff1c7f02906e568997bdd7dc43006655387e.tar.gz
Resolve inconsistent parcel read in NanoAppFilter
Bug: 77599679 Test: Compile only Change-Id: Ib417a5cb4d51744442d2fb14437cabbe5fd1c266 (cherry picked from commit abe5a73a4a81e312a1690fbc10a6b99ce98b699a)
-rw-r--r--core/java/android/hardware/location/NanoAppFilter.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/core/java/android/hardware/location/NanoAppFilter.java b/core/java/android/hardware/location/NanoAppFilter.java
index bf35a3d6fbd6..c44094908f3c 100644
--- a/core/java/android/hardware/location/NanoAppFilter.java
+++ b/core/java/android/hardware/location/NanoAppFilter.java
@@ -83,7 +83,7 @@ public class NanoAppFilter {
mAppId = in.readLong();
mAppVersion = in.readInt();
mVersionRestrictionMask = in.readInt();
- mAppIdVendorMask = in.readInt();
+ mAppIdVendorMask = in.readLong();
}
public int describeContents() {
@@ -91,7 +91,6 @@ public class NanoAppFilter {
}
public void writeToParcel(Parcel out, int flags) {
-
out.writeLong(mAppId);
out.writeInt(mAppVersion);
out.writeInt(mVersionRestrictionMask);