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

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

Merge "[framework] Add onLaunchRoutingTableFull oem callback" into main

parents 92f337f7 65a26610

nfc/api/system-current.txt

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

    method public void onRfFieldActivated(boolean);

    method public void onRoutingChanged();

    method public void onRoutingTableFull();

    method public void onStateUpdated(int);

    method public void onTagConnected(boolean);

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

nfc/java/android/nfc/INfcOemExtensionCallback.aidl

+1 −0
Original line number Diff line number Diff line
@@ -52,5 +52,6 @@ interface INfcOemExtensionCallback { 
   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);

   void onLaunchHceTapAgainActivity(in ApduServiceInfo service, in String category);

   void onRoutingTableFull();

   void onLogEventNotified(in OemLogItems item);

}

nfc/java/android/nfc/NfcOemExtension.java

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

        void onLaunchHceTapAgainDialog(@NonNull ApduServiceInfo service, @NonNull String category);



        /**

         * Callback to indicate that routing table is full and the OEM can optionally launch a

         * dialog to request the user to remove some Card Emulation apps from the device to free

         * routing table space.

         */

        void onRoutingTableFull();



        /**

         * Callback when OEM specified log event are notified.

         * @param item the log items that contains log information of NFC event.
@@ -853,6 +860,12 @@ public final class NfcOemExtension { 
                    handleVoidCallback(enabled, cb::onReaderOptionChanged, ex));

        }



        public void onRoutingTableFull() throws RemoteException {

            mCallbackMap.forEach((cb, ex) ->

                    handleVoidCallback(null,

                            (Object input) -> cb.onRoutingTableFull(), ex));

        }



        @Override

        public void onGetOemAppSearchIntent(List<String> packages, ResultReceiver intentConsumer)

                throws RemoteException {