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

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

Merge "Add OemExtension callbacks support" into main

parents 5fb7c861 74cda91f

nfc/api/system-current.txt

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

    method public void onDisableFinished(int);

    method public void onDisableStarted();

    method public void onEeListenActivated(boolean);

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

    method public void onEnableFinished(int);

    method public void onEnableStarted();

nfc/java/android/nfc/INfcOemExtensionCallback.aidl

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ interface INfcOemExtensionCallback { 
   void onCardEmulationActivated(boolean isActivated);

   void onRfFieldActivated(boolean isActivated);

   void onRfDiscoveryStarted(boolean isDiscoveryStarted);

   void onEeListenActivated(boolean isActivated);

   void onGetOemAppSearchIntent(in List<String> firstPackage, in ResultReceiver intentConsumer);

   void onNdefMessage(in Tag tag, in NdefMessage message, in ResultReceiver hasOemExecutableContent);

   void onLaunchHceAppChooserActivity(in String selectedAid, in List<ApduServiceInfo> services, in ComponentName failedComponent, in String category);

nfc/java/android/nfc/NfcOemExtension.java

+16 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ public final class NfcOemExtension { 
    private boolean mCardEmulationActivated = false;

    private boolean mRfFieldActivated = false;

    private boolean mRfDiscoveryStarted = false;

    private boolean mEeListenActivated = false;



    /**

     * Broadcast Action: Sent on NFC stack initialization when NFC OEM extensions are enabled.
@@ -325,6 +326,13 @@ public final class NfcOemExtension { 
        */

        void onRfDiscoveryStarted(boolean isDiscoveryStarted);



        /**

        * Notifies the NFCEE (NFC Execution Environment) Listen has been activated.

        *

        * @param isActivated true, if EE Listen is ON, else EE Listen is OFF.

        */

        void onEeListenActivated(boolean isActivated);



        /**

         * Gets the intent to find the OEM package in the OEM App market. If the consumer returns

         * {@code null} or a timeout occurs, the intent from the first available package will be
@@ -436,6 +444,7 @@ public final class NfcOemExtension { 
                callback.onCardEmulationActivated(mCardEmulationActivated);

                callback.onRfFieldActivated(mRfFieldActivated);

                callback.onRfDiscoveryStarted(mRfDiscoveryStarted);

                callback.onEeListenActivated(mEeListenActivated);

            });

        }

    }
@@ -709,6 +718,13 @@ public final class NfcOemExtension { 
                    handleVoidCallback(isDiscoveryStarted, cb::onRfDiscoveryStarted, ex));

        }



        @Override

        public void onEeListenActivated(boolean isActivated) throws RemoteException {

            mEeListenActivated = isActivated;

            mCallbackMap.forEach((cb, ex) ->

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

        }



        @Override

        public void onStateUpdated(int state) throws RemoteException {

            mCallbackMap.forEach((cb, ex) ->