settings: Remove @hide NFC API usage
These @hide usages in other parts of platform need to be cleaned
up to unbundle NFC mainline module.
Flag: None (The NFC flag - `enableNfcMainline` has been promoted to trunkfood. Note these APIs are available as @hide even if not available in formal SDK until V)
Bug: 307352220
Test: Compiles
Change-Id: I6f87ad7ae03c67aaa2ddb0ac2529debc53278ba8
diff --git a/Android.bp b/Android.bp
index 045a963..b456a72 100644
--- a/Android.bp
+++ b/Android.bp
@@ -75,7 +75,6 @@
"android.hardware.dumpstate-V1-java",
"android.hardware.dumpstate-V1.0-java",
"android.hardware.dumpstate-V1.1-java",
- "android.nfc.flags-aconfig-java",
"android.view.accessibility.flags-aconfig-java",
"com_android_server_accessibility_flags_lib",
"net-utils-framework-common",
diff --git a/src/com/android/settings/applications/specialaccess/PaymentSettingsEnabler.java b/src/com/android/settings/applications/specialaccess/PaymentSettingsEnabler.java
index e378eb3..b95da80 100644
--- a/src/com/android/settings/applications/specialaccess/PaymentSettingsEnabler.java
+++ b/src/com/android/settings/applications/specialaccess/PaymentSettingsEnabler.java
@@ -17,7 +17,6 @@
package com.android.settings.applications.specialaccess;
import android.content.Context;
-import android.nfc.Flags;
import android.nfc.NfcAdapter;
import android.nfc.cardemulation.CardEmulation;
import android.os.UserHandle;
@@ -67,12 +66,8 @@
}
private boolean hasAnyServices() {
- if (Flags.enableNfcMainline()) {
- return mCardEmuManager.getServices(
- CardEmulation.CATEGORY_PAYMENT, UserHandle.myUserId()).isEmpty();
- } else {
- return mCardEmuManager.getServices(CardEmulation.CATEGORY_PAYMENT).isEmpty();
- }
+ return mCardEmuManager.getServices(
+ CardEmulation.CATEGORY_PAYMENT, UserHandle.myUserId()).isEmpty();
}
@Override