diff options
-rw-r--r-- | Android.bp | 1 | ||||
-rw-r--r-- | src/com/android/settings/applications/specialaccess/PaymentSettingsEnabler.java | 13 |
2 files changed, 13 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp index 31895db32b1..d8ca75e7435 100644 --- a/Android.bp +++ b/Android.bp @@ -61,6 +61,7 @@ android_library { "res-product", ], static_libs: [ + "android.nfc.flags-aconfig-java", "androidx-constraintlayout_constraintlayout", "androidx.slice_slice-builders", "androidx.slice_slice-core", diff --git a/src/com/android/settings/applications/specialaccess/PaymentSettingsEnabler.java b/src/com/android/settings/applications/specialaccess/PaymentSettingsEnabler.java index 597705ca170..e378eb3ca74 100644 --- a/src/com/android/settings/applications/specialaccess/PaymentSettingsEnabler.java +++ b/src/com/android/settings/applications/specialaccess/PaymentSettingsEnabler.java @@ -17,8 +17,10 @@ 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; import androidx.preference.Preference; @@ -64,12 +66,21 @@ 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(); + } + } + @Override public void resume() { if (!isNfcAvailable()) { return; } - if (mCardEmuManager.getServices(CardEmulation.CATEGORY_PAYMENT).isEmpty()) { + if (hasAnyServices()) { mIsPaymentAvailable = false; } else { mIsPaymentAvailable = true; |