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-01 21:32:04 +0000
commit27a24c0a4882780e20981c286428b43ee7b4ac8c (patch)
treeb19934a2a663259293367931df9c37b0fb628a83
parentfc8cfa00fddc153ac46c4a375f4354f4ba214a2f (diff)
downloadbase-27a24c0a4882780e20981c286428b43ee7b4ac8c.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 4d8e7344cd75..562065e20815 100644
--- a/core/java/android/hardware/location/NanoAppFilter.java
+++ b/core/java/android/hardware/location/NanoAppFilter.java
@@ -85,7 +85,7 @@ public class NanoAppFilter implements Parcelable {
mAppId = in.readLong();
mAppVersion = in.readInt();
mVersionRestrictionMask = in.readInt();
- mAppIdVendorMask = in.readInt();
+ mAppIdVendorMask = in.readLong();
}
public int describeContents() {
@@ -93,7 +93,6 @@ public class NanoAppFilter implements Parcelable {
}
public void writeToParcel(Parcel out, int flags) {
-
out.writeLong(mAppId);
out.writeInt(mAppVersion);
out.writeInt(mVersionRestrictionMask);