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

Commit bfcd5a0d authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "OEM action when readerOptionChanged feature request" into main

parents 9f0ae178 b41fe36b

nfc/api/system-current.txt

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

    method public void onEnableStarted();

    method public void onHceEventReceived(int);

    method public void onHceEventReceived(int);

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

    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 onRfDiscoveryStarted(boolean);

    method public void onRfFieldActivated(boolean);

    method public void onRfFieldActivated(boolean);

    method public void onRoutingChanged();

    method public void onRoutingChanged();

nfc/java/android/nfc/INfcOemExtensionCallback.aidl

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

   void onTagDispatch(in ResultReceiver isSkipped);

   void onRoutingChanged();

   void onRoutingChanged();

   void onHceEventReceived(int action);

   void onHceEventReceived(int action);

   void onReaderOptionChanged(boolean enabled);

   void onCardEmulationActivated(boolean isActivated);

   void onCardEmulationActivated(boolean isActivated);

   void onRfFieldActivated(boolean isActivated);

   void onRfFieldActivated(boolean isActivated);

   void onRfDiscoveryStarted(boolean isDiscoveryStarted);

   void onRfDiscoveryStarted(boolean isDiscoveryStarted);

nfc/java/android/nfc/NfcOemExtension.java

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

         */

        void onHceEventReceived(@HostCardEmulationAction int action);

        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.

        * Notifies NFC is activated in listen mode.

        * NFC Forum NCI-2.3 ch.5.2.6 specification

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

                    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(

        private <T> void handleVoidCallback(

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

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

            synchronized (mLock) {

            synchronized (mLock) {