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

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

Merge "Rename onRfFieldActivated to onRfFieldDetected per API review" into... 

Merge "Rename onRfFieldActivated to onRfFieldDetected per API review" into main am: 70233164 am: 2f2f177c

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



Change-Id: I0ad5bbeab51d0cb5449fbb0e0587b634ff5d0b30
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d69b9de9 2f2f177c

nfc/api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ package android.nfc { 
    method public void onNdefRead(@NonNull java.util.function.Consumer<java.lang.Boolean>);

    method public void onReaderOptionChanged(boolean);

    method public void onRfDiscoveryStarted(boolean);

    method public void onRfFieldActivated(boolean);

    method public void onRfFieldDetected(boolean);

    method public void onRoutingChanged(@NonNull java.util.function.Consumer<java.lang.Boolean>);

    method public void onRoutingTableFull();

    method public void onStateUpdated(int);

nfc/java/android/nfc/INfcOemExtensionCallback.aidl

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ interface INfcOemExtensionCallback { 
   void onHceEventReceived(int action);

   void onReaderOptionChanged(boolean enabled);

   void onCardEmulationActivated(boolean isActivated);

   void onRfFieldActivated(boolean isActivated);

   void onRfFieldDetected(boolean isActive);

   void onRfDiscoveryStarted(boolean isDiscoveryStarted);

   void onEeListenActivated(boolean isActivated);

   void onEeUpdated();

nfc/java/android/nfc/NfcOemExtension.java

+7 −7
Original line number Diff line number Diff line
@@ -408,12 +408,12 @@ public final class NfcOemExtension { 
        void onCardEmulationActivated(boolean isActivated);



        /**

        * Notifies the Remote NFC Endpoint RF Field is activated.

        * Notifies the Remote NFC Endpoint RF Field is detected.

        * NFC Forum NCI-2.3 ch.5.3 specification

        *

        * @param isActivated true, if RF Field is ON, else RF Field is OFF.

        * @param isActive true, if RF Field is ON, else RF Field is OFF.

        */

        void onRfFieldActivated(boolean isActivated);

        void onRfFieldDetected(boolean isActive);



        /**

        * Notifies the NFC RF discovery is started or in the IDLE state.
@@ -596,7 +596,7 @@ public final class NfcOemExtension { 
            Log.i(TAG, "updateNfCState");

            executor.execute(() -> {

                callback.onCardEmulationActivated(mCardEmulationActivated);

                callback.onRfFieldActivated(mRfFieldActivated);

                callback.onRfFieldDetected(mRfFieldActivated);

                callback.onRfDiscoveryStarted(mRfDiscoveryStarted);

                callback.onEeListenActivated(mEeListenActivated);

            });
@@ -936,10 +936,10 @@ public final class NfcOemExtension { 
        }



        @Override

        public void onRfFieldActivated(boolean isActivated) throws RemoteException {

            mRfFieldActivated = isActivated;

        public void onRfFieldDetected(boolean isActive) throws RemoteException {

            mRfFieldActivated = isActive;

            mCallbackMap.forEach((cb, ex) ->

                    handleVoidCallback(isActivated, cb::onRfFieldActivated, ex));

                    handleVoidCallback(isActive, cb::onRfFieldDetected, ex));

        }



        @Override