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

Merge "settings: Remove @hide NFC API usage" into main am: 75a49e0abb am: da05498175

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2851159

Change-Id: Iadfb1f67802dbec8ff68271d7199ca83edd3b9bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Roshan Pius
2023-11-30 19:00:17 +00:00
committed by Automerger Merge Worker
parent a9007d74d2 da05498175
commit ac2f252ec8
2 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Android.bp
View File

@@ -61,7 +61,6 @@ android_library {
"res-product", "res-product",
], ],
static_libs: [ static_libs: [
"android.nfc.flags-aconfig-java",
"androidx-constraintlayout_constraintlayout", "androidx-constraintlayout_constraintlayout",
"androidx.slice_slice-builders", "androidx.slice_slice-builders",
"androidx.slice_slice-core", "androidx.slice_slice-core",

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

@@ -17,7 +17,6 @@
package com.android.settings.applications.specialaccess; package com.android.settings.applications.specialaccess;
import android.content.Context; import android.content.Context;
import android.nfc.Flags;
import android.nfc.NfcAdapter; import android.nfc.NfcAdapter;
import android.nfc.cardemulation.CardEmulation; import android.nfc.cardemulation.CardEmulation;
import android.os.UserHandle; import android.os.UserHandle;
@@ -67,12 +66,8 @@ public class PaymentSettingsEnabler extends BaseNfcEnabler {
} }
private boolean hasAnyServices() { private boolean hasAnyServices() {
if (Flags.enableNfcMainline()) { return mCardEmuManager.getServices(
return mCardEmuManager.getServices( CardEmulation.CATEGORY_PAYMENT, UserHandle.myUserId()).isEmpty();
CardEmulation.CATEGORY_PAYMENT, UserHandle.myUserId()).isEmpty();
} else {
return mCardEmuManager.getServices(CardEmulation.CATEGORY_PAYMENT).isEmpty();
}
} }
@Override @Override