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

Commit cab2fa77 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role)
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

Change-Id: I6e3461125290f2835ff1f9a996beb92e64172386
parents cec93100 c2cfe453

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

+1 −2
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ public class NanoAppFilter { 
        mAppId = in.readLong();

        mAppVersion = in.readInt();

        mVersionRestrictionMask = in.readInt();

        mAppIdVendorMask = in.readInt();

        mAppIdVendorMask = in.readLong();

    }



    public int describeContents() {
@@ -91,7 +91,6 @@ public class NanoAppFilter { 
    }



    public void writeToParcel(Parcel out, int flags) {



        out.writeLong(mAppId);

        out.writeInt(mAppVersion);

        out.writeInt(mVersionRestrictionMask);