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

Commit e733e5a3 authored by Chloe Dai's avatar Chloe Dai Committed by Automerger Merge Worker
Browse files

Merge changes from topic "Backport: tag availability checking mechanism" into... 

Merge changes from topic "Backport: tag availability checking mechanism" into sc-v2-dev-plus-aosp am: 40a364f2

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

Change-Id: I14e5e6e0b7bd6d8333ed8d35557ff3dcf7d01fbf
parents 485bf92c 40a364f2

core/java/android/nfc/Tag.java

+9 −1
Original line number Diff line number Diff line
@@ -142,9 +142,13 @@ public final class Tag implements Parcelable { 
        mTagService = tagService;



        mConnectedTechnology = -1;

        mCookie = SystemClock.elapsedRealtime();



        if (tagService == null) {

            return;

        }



        try {

            mCookie = SystemClock.elapsedRealtime();

            tagService.setTagUpToDate(mCookie);

        } catch (RemoteException e) {

            throw e.rethrowAsRuntimeException();
@@ -370,6 +374,10 @@ public final class Tag implements Parcelable { 
    /** @hide */

    @UnsupportedAppUsage

    public INfcTag getTagService() {

        if (mTagService == null) {

            return null;

        }



        try {

            if (!mTagService.isTagUpToDate(mCookie)) {

                String id_str = "";