diff options
author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-11-07 04:48:36 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-07 04:48:36 +0000 |
commit | 3521df9dca4e30f77d1c1e7b6c34b9d2c83a9ff0 (patch) | |
tree | 700c0e908d41e20fbf88240cb9101a3dba4c3c1e | |
parent | ff03ce88ff12abdf6a125cd3c8b880d94b25468e (diff) | |
parent | 85ca373e758481a4127a7834ba9badc1919dcf02 (diff) | |
download | Settings-3521df9dca4e30f77d1c1e7b6c34b9d2c83a9ff0.tar.gz |
Merge "settings(payments): Use newly exposed formal API for CardEmulation.getServices()" into main am: 85ca373e75
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2810325
Change-Id: I0ac76dbfb034e1a9856b231aa59b3ec0197914d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-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; |