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

Commit 267b960d 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

Change-Id: Ia3222d7b97b2d1083404d607738fc15d2646999c
parents b9ed290b e9b67d2b

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