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 Merged-In: I6f87ad7ae03c67aaa2ddb0ac2529debc53278ba8 Change-Id: I6f87ad7ae03c67aaa2ddb0ac2529debc53278ba8
This commit is contained in:
@@ -61,7 +61,6 @@ android_library {
|
||||
"res-product",
|
||||
],
|
||||
static_libs: [
|
||||
"android.nfc.flags-aconfig-java",
|
||||
"androidx-constraintlayout_constraintlayout",
|
||||
"androidx.slice_slice-builders",
|
||||
"androidx.slice_slice-core",
|
||||
|
@@ -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 @@ public class PaymentSettingsEnabler extends BaseNfcEnabler {
|
||||
}
|
||||
|
||||
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
|
||||
|
Reference in New Issue
Block a user