From 392e4f1abe4e59a320c65349e76ca1e41a8270cb Mon Sep 17 00:00:00 2001 From: Omer Ozer Date: Sun, 4 Feb 2024 03:45:22 +0000 Subject: [PATCH] Disable nfc foreground setting ui when the wallet role is enabled. Bug: 315194263 Test: local Change-Id: I495c6c62b841617cf7914703740d8b52f628fd45 --- .../settings/nfc/NfcForegroundPreferenceController.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/com/android/settings/nfc/NfcForegroundPreferenceController.java b/src/com/android/settings/nfc/NfcForegroundPreferenceController.java index a4cad8734ec..b036da24109 100644 --- a/src/com/android/settings/nfc/NfcForegroundPreferenceController.java +++ b/src/com/android/settings/nfc/NfcForegroundPreferenceController.java @@ -16,6 +16,7 @@ package com.android.settings.nfc; import android.app.settings.SettingsEnums; import android.content.Context; import android.content.pm.PackageManager; +import android.permission.flags.Flags; import androidx.preference.ListPreference; import androidx.preference.Preference; @@ -68,6 +69,9 @@ public class NfcForegroundPreferenceController extends BasePreferenceController @Override public int getAvailabilityStatus() { + if (Flags.walletRoleEnabled()) { + return UNSUPPORTED_ON_DEVICE; + } final PackageManager pm = mContext.getPackageManager(); if (!pm.hasSystemFeature(PackageManager.FEATURE_NFC)) { return UNSUPPORTED_ON_DEVICE;