commit 75a49e0abb1891f48f06d7aaf8dc55a6faf51b35
author Roshan Pius <rpius@google.com> Thu Nov 30 17:29:37 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Nov 30 17:29:37 2023 +0000
tree 49d83cdfac51650a15bafa59a9b8fb0b40534f07
parent 7ec6e27c644fd8ef0a1b6ab7fd5813d0dc3e9ddb
parent 0d11f492f7e23e5958a15c69d0c0c2bd7044f9bc

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

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