Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[automerger] Resolve inconsistent parcel read in NanoAppFilter am: abe5a73a4a am: 2895b320b4 am: 77e6e34644 am: 49e97ea1dc am: c2cfe453f2

Browse Source 
Change-Id: I6e3461125290f2835ff1f9a996beb92e64172386
This commit is contained in:
Android Build Merger (Role)
2018-07-06 22:55:21 +00:00
parent cec93100ea c2cfe453f2
commit cab2fa779e
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/hardware/location/NanoAppFilter.java
View File

@@ -83,7 +83,7 @@ public class NanoAppFilter {
mAppId = in.readLong(); mAppId = in.readLong();
mAppVersion = in.readInt(); mAppVersion = in.readInt();
mVersionRestrictionMask = in.readInt(); mVersionRestrictionMask = in.readInt();
mAppIdVendorMask = in.readInt(); mAppIdVendorMask = in.readLong();
} }
public int describeContents() { public int describeContents() {
@@ -91,7 +91,6 @@ public class NanoAppFilter {
} }
public void writeToParcel(Parcel out, int flags) { public void writeToParcel(Parcel out, int flags) {
out.writeLong(mAppId); out.writeLong(mAppId);
out.writeInt(mAppVersion); out.writeInt(mAppVersion);
out.writeInt(mVersionRestrictionMask); out.writeInt(mVersionRestrictionMask);