commit ac2f252ec8c8357cb7573717f91cc69f84350c2f
author Roshan Pius <rpius@google.com> Thu Nov 30 19:00:17 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Nov 30 19:00:17 2023 +0000
tree 1992d74976f273743a9b91f89e5a75dfe7a5927b
parent a9007d74d226cb2a0dc5bebcc34f37d5c26c21a0
parent da05498175dabebad7c99c821a1d91106140e524

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

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>

Android.bp

diff --git a/Android.bp b/Android.bp
index d8ca75e..31895db 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