commit e234fe32816606af69622f00cab1c45cd9cc2430
author Roshan Pius <rpius@google.com> Thu Nov 30 18:31:30 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Nov 30 18:31:30 2023 +0000
tree 53484e8b55301b238cceb6921f7661c8d0689b21
parent 7f849bdaac918f992d60193a1c3a91b14ed276d3
parent 75a49e0abb1891f48f06d7aaf8dc55a6faf51b35

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

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

Change-Id: I8d1c96e7232958e40885dfcf7ff58ce38340e410
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Android.bp

diff --git a/Android.bp b/Android.bp
index 9680b8b..4d07913 100644
--- a/Android.bp
+++ b/Android.bp
@@ -61,7 +61,6 @@
         "res-product",
     ],
     static_libs: [
-        "android.nfc.flags-aconfig-java",
         "androidx-constraintlayout_constraintlayout",
         "androidx.slice_slice-builders",
         "androidx.slice_slice-core",

src/com/android/settings/applications/specialaccess/PaymentSettingsEnabler.java

diff --git a/src/com/android/settings/applications/specialaccess/PaymentSettingsEnabler.java b/src/com/android/settings/applications/specialaccess/PaymentSettingsEnabler.java
index e378eb3..b95da80 100644
--- a/src/com/android/settings/applications/specialaccess/PaymentSettingsEnabler.java
+++ b/src/com/android/settings/applications/specialaccess/PaymentSettingsEnabler.java
@@ -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 @@
     }
 
     private boolean hasAnyServices() {
-        if (Flags.enableNfcMainline()) {
-            return mCardEmuManager.getServices(
-                CardEmulation.CATEGORY_PAYMENT, UserHandle.myUserId()).isEmpty();
-        } else {
-            return mCardEmuManager.getServices(CardEmulation.CATEGORY_PAYMENT).isEmpty();
-        }
+        return mCardEmuManager.getServices(
+            CardEmulation.CATEGORY_PAYMENT, UserHandle.myUserId()).isEmpty();
     }
 
     @Override