commit 3ee301360c333362ded4de1c44a0bef8d848c770
author ziyiw <ziyiw@google.com> Tue Jul 30 21:26:50 2024 +0000
committer ziyiw <ziyiw@google.com> Wed Aug 14 18:47:22 2024 +0000
tree fa60d39ed77cab24b0879beb6f56bc69be9d23cd
parent 991a9dfd5e3c4388f29fbc9858c47ff68761593f

[framework] Expose override/recover routingTable as systemApi.

Test: atest CtsNfcTestCases
Bug: 329043523
Flag: android.nfc.nfc_override_recover_routing_table

Change-Id: I2f01f4e2884357ef284207e12d58f21fb1fba851

nfc/api/current.txt

diff --git a/nfc/api/current.txt b/nfc/api/current.txt
index b0d1f71..447e980 100644
--- a/nfc/api/current.txt
+++ b/nfc/api/current.txt
@@ -220,11 +220,14 @@
     field @Deprecated public static final String ACTION_CHANGE_DEFAULT = "android.nfc.cardemulation.action.ACTION_CHANGE_DEFAULT";
     field public static final String CATEGORY_OTHER = "other";
     field public static final String CATEGORY_PAYMENT = "payment";
+    field @FlaggedApi("android.nfc.nfc_override_recover_routing_table") public static final String DH = "DH";
+    field @FlaggedApi("android.nfc.nfc_override_recover_routing_table") public static final String ESE = "ESE";
     field public static final String EXTRA_CATEGORY = "category";
     field public static final String EXTRA_SERVICE_COMPONENT = "component";
     field public static final int SELECTION_MODE_ALWAYS_ASK = 1; // 0x1
     field public static final int SELECTION_MODE_ASK_IF_CONFLICT = 2; // 0x2
     field public static final int SELECTION_MODE_PREFER_DEFAULT = 0; // 0x0
+    field @FlaggedApi("android.nfc.nfc_override_recover_routing_table") public static final String UICC = "UICC";
   }
 
   public abstract class HostApduService extends android.app.Service {

nfc/api/system-current.txt

diff --git a/nfc/api/system-current.txt b/nfc/api/system-current.txt
index 3375e18c..4a988aa 100644
--- a/nfc/api/system-current.txt
+++ b/nfc/api/system-current.txt
@@ -74,6 +74,8 @@
   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.nfc_override_recover_routing_table") public void overrideRoutingTable(@NonNull android.app.Activity, @Nullable String, @Nullable String);
+    method @FlaggedApi("android.nfc.nfc_override_recover_routing_table") public void recoverRoutingTable(@NonNull android.app.Activity);
   }
 
 }