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 am: cab2fa779e am: bf8733b162

Browse Source 
am: e9b67d2b22

Change-Id: Ia3222d7b97b2d1083404d607738fc15d2646999c
This commit is contained in:
Arthur Ishiguro
2018-07-11 14:40:57 -07:00
committed by android-build-merger
parent b9ed290b01 e9b67d2b22
commit 267b960dab
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

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