PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "settings(payments): Use newly exposed formal API for CardEmulation.getServices()" into main

Browse Source
This commit is contained in:
Treehugger Robot
2023-10-31 18:17:00 +00:00
committed by Android (Google) Code Review
parent ed32d57673 a5d82be483
commit 418f3ef6b9
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Android.bp
View File

@@ -75,6 +75,7 @@ android_library {
"android.hardware.dumpstate-V1-java",
"android.hardware.dumpstate-V1.0-java",
"android.hardware.dumpstate-V1.1-java",
"android.nfc.flags-aconfig-java",
"net-utils-framework-common",
"notification_flags_lib",
"securebox",

13
src/com/android/settings/applications/specialaccess/PaymentSettingsEnabler.java
View File

@@ -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;