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

Commit b9912a25 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

Change-Id: I78fff5a76a8e1215e3a4235cbe65cc95d0fb8653
parents a35f24bc 267b960d

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

+1 −2
Original line number Original line Diff line number Diff line
@@ -85,7 +85,7 @@ public class NanoAppFilter implements Parcelable { 
        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() {
@@ -93,7 +93,6 @@ public class NanoAppFilter implements Parcelable { 
    }

    }





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