Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 78c1e790 authored by Arthur Ishiguro's avatar Arthur Ishiguro Committed by android-build-merger
Browse files

[automerger] Resolve inconsistent parcel read in NanoAppFilter am: abe5a73a... 

[automerger] Resolve inconsistent parcel read in NanoAppFilter am: abe5a73a am: 2895b320 am: 77e6e346 am: 49e97ea1 am: c2cfe453 am: cab2fa77 am: bf8733b1 am: e9b67d2b am: 267b960d
am: b9912a25

Change-Id: Ic85c323a3b706808616e1cf9d3e30a95ca2c37f6
parents 0951381f b9912a25

core/java/android/hardware/location/NanoAppFilter.java

+1 −2
Original line number Diff line number Diff line
@@ -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);