Use a static getter to fetch the preferred payment setting
We need to use this from the system server before the NFC service has
started. This makes getting an instance of `CardEmulation` difficult, so
instead make it into a static method and access the setting directly
instead of via the service.
Bug: 321098555
Test: manual,NFC CTS tests
Change-Id: I92e7cfeb595a13b8d544b4a3169601748fef7101
diff --git a/nfc/api/system-current.txt b/nfc/api/system-current.txt
index 40672a1..1e6b401 100644
--- a/nfc/api/system-current.txt
+++ b/nfc/api/system-current.txt
@@ -45,7 +45,7 @@
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 android.nfc.cardemulation.ApduServiceInfo getPreferredPaymentService();
+ 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);
}