Merge "settings: Remove @hide NFC API usage" into main (75a49e0a) · Commits · e / os / android_packages_apps_Settings

Android.bp

+0 −1

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

+2 −7

Original line number	Diff line number	Diff line
		@@ -17,7 +17,6 @@
		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;
		@@ -67,12 +66,8 @@ 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