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

settings: Remove @hide NFC API usage

Browse Source 
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

Change-Id: I6f87ad7ae03c67aaa2ddb0ac2529debc53278ba8
This commit is contained in:
Roshan Pius
2023-11-03 10:48:10 -07:00
parent 6a725695b7
commit f04ee0dfab
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

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

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