commit b794b4cb9e5c541ef6142f689bcbe70aa56829f5
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Jul 16 19:25:14 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jul 16 19:25:14 2018 +0000
tree d7d8ea6cacf754334ee63906893e166564ed2c8a
parent abe5a73a4a81e312a1690fbc10a6b99ce98b699a
parent 0d2dc943dcaa3d7c8479e22ae62be9753ea2643c

Merge "Fix TrackInfo parcel write" into nyc-dev

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);