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

Browse Source 
Change-Id: Ieb925f073b80e4d624552e738d49b0996f0485ae
This commit is contained in:
Android Build Merger (Role)
2018-07-06 22:54:55 +00:00
parent b9c3b099e4 abe5a73a4a
commit 2895b320b4
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

@@ -82,7 +82,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() {
@@ -90,7 +90,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);