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

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

Merge "OEM action when readerOptionChanged feature request" into main am: bfcd5a0d 

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



Change-Id: Icc343cb8a3eae94d323e905f1072a305f7984e3a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 33ce5fbd bfcd5a0d

nfc/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ package android.nfc { 
    method public void onEnableStarted();

    method public void onHceEventReceived(int);

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

nfc/java/android/nfc/INfcOemExtensionCallback.aidl

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ interface INfcOemExtensionCallback { 
   void onTagDispatch(in ResultReceiver isSkipped);

   void onRoutingChanged();

   void onHceEventReceived(int action);

   void onReaderOptionChanged(boolean enabled);

   void onCardEmulationActivated(boolean isActivated);

   void onRfFieldActivated(boolean isActivated);

   void onRfDiscoveryStarted(boolean isDiscoveryStarted);

nfc/java/android/nfc/NfcOemExtension.java

+13 −0
Original line number Diff line number Diff line
@@ -222,6 +222,13 @@ public final class NfcOemExtension { 
         */

        void onHceEventReceived(@HostCardEmulationAction int action);



        /**

         * API to notify when reader option has been changed using

         * {@link NfcAdapter#enableReaderOption(boolean)} by some app.

         * @param enabled Flag indicating ReaderMode enabled/disabled

         */

        void onReaderOptionChanged(boolean enabled);



        /**

        * Notifies NFC is activated in listen mode.

        * NFC Forum NCI-2.3 ch.5.2.6 specification
@@ -488,6 +495,12 @@ public final class NfcOemExtension { 
                    handleVoidCallback(action, cb::onHceEventReceived, ex));

        }



        @Override

        public void onReaderOptionChanged(boolean enabled) throws RemoteException {

            mCallbackMap.forEach((cb, ex) ->

                    handleVoidCallback(enabled, cb::onReaderOptionChanged, ex));

        }



        private <T> void handleVoidCallback(

                T input, Consumer<T> callbackMethod, Executor executor) {

            synchronized (mLock) {