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

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

Merge "nfc(api): Move isEuiccSupported() from @SystemApi to public" into main... 

Merge "nfc(api): Move isEuiccSupported() from @SystemApi to public" into main am: e040a806 am: e82ddadc

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



Change-Id: I1c8cd6ab14d9dc0da638ab0f1fd6b6c543c6f178
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 91fabba7 e82ddadc

nfc/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -205,6 +205,7 @@ package android.nfc.cardemulation { 
    method public int getSelectionModeForCategory(String);

    method public boolean isDefaultServiceForAid(android.content.ComponentName, String);

    method public boolean isDefaultServiceForCategory(android.content.ComponentName, String);

    method @FlaggedApi("android.nfc.enable_card_emulation_euicc") public boolean isEuiccSupported();

    method public boolean registerAidsForService(android.content.ComponentName, String, java.util.List<java.lang.String>);

    method @FlaggedApi("android.nfc.nfc_read_polling_loop") public boolean registerPollingLoopFilterForService(@NonNull android.content.ComponentName, @NonNull String, boolean);

    method @FlaggedApi("android.nfc.nfc_read_polling_loop") public boolean registerPollingLoopPatternFilterForService(@NonNull android.content.ComponentName, @NonNull String, boolean);

nfc/api/system-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -98,7 +98,6 @@ package android.nfc.cardemulation { 
  public final class CardEmulation {

    method @FlaggedApi("android.permission.flags.wallet_role_enabled") @Nullable @RequiresPermission(android.Manifest.permission.NFC_PREFERRED_PAYMENT_INFO) public static android.content.ComponentName getPreferredPaymentService(@NonNull android.content.Context);

    method @FlaggedApi("android.nfc.enable_nfc_mainline") @NonNull public java.util.List<android.nfc.cardemulation.ApduServiceInfo> getServices(@NonNull String, int);

    method @FlaggedApi("android.nfc.enable_card_emulation_euicc") public boolean isEuiccSupported();

    method @FlaggedApi("android.nfc.nfc_override_recover_routing_table") public void overrideRoutingTable(@NonNull android.app.Activity, int, int);

    method @FlaggedApi("android.nfc.nfc_override_recover_routing_table") public void recoverRoutingTable(@NonNull android.app.Activity);

  }

nfc/java/android/nfc/cardemulation/CardEmulation.java

+0 −2
Original line number Diff line number Diff line
@@ -992,9 +992,7 @@ public final class CardEmulation { 
     * Is EUICC supported as a Secure Element EE which supports off host card emulation.

     *

     * @return true if the device supports EUICC for off host card emulation, false otherwise.

     * @hide

     */

    @SystemApi

    @FlaggedApi(android.nfc.Flags.FLAG_ENABLE_CARD_EMULATION_EUICC)

    public boolean isEuiccSupported() {

        return callServiceReturn(() -> sService.isEuiccSupported(), false);