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

Commit ed7c9b85 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "[bug fix] Handle the case when rfFieldOnTime is not set in OemLog." into main am: 78d37c3a 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3341785



Change-Id: If5eaeb486736ca5c4b5c3da49251acb41a70e055
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 90d7d571 78d37c3a

nfc/java/android/nfc/OemLogItems.java

+11 −3
Original line number Diff line number Diff line
@@ -142,8 +142,11 @@ public final class OemLogItems implements Parcelable { 
        dest.writeByteArray(mCommandApdus);

        dest.writeInt(mResponseApdus.length);

        dest.writeByteArray(mResponseApdus);

        dest.writeBoolean(mRfFieldOnTime != null);

        if (mRfFieldOnTime != null) {

            dest.writeLong(mRfFieldOnTime.getEpochSecond());

            dest.writeInt(mRfFieldOnTime.getNano());

        }

        dest.writeParcelable(mTag, 0);

    }
@@ -305,7 +308,12 @@ public final class OemLogItems implements Parcelable { 
        in.readByteArray(this.mCommandApdus);

        this.mResponseApdus = new byte[in.readInt()];

        in.readByteArray(this.mResponseApdus);

        boolean isRfFieldOnTimeSet = in.readBoolean();

        if (isRfFieldOnTimeSet) {

            this.mRfFieldOnTime = Instant.ofEpochSecond(in.readLong(), in.readInt());

        } else {

            this.mRfFieldOnTime = null;

        }

        this.mTag = in.readParcelable(Tag.class.getClassLoader(), Tag.class);

    }