From 8ef8e4ea24037b62fa5749034b9506455fde3501 Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Thu, 9 Feb 2023 11:16:46 -0800 Subject: [PATCH] nfc: Migrate away from @hide getIntForUser Bug: 244264995 Test: Compiles Change-Id: I50c79e4da929a431c91887278fbe42653c52c74f --- core/java/android/nfc/cardemulation/CardEmulation.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/core/java/android/nfc/cardemulation/CardEmulation.java b/core/java/android/nfc/cardemulation/CardEmulation.java index 6a4209135c66d..ac3344e91c062 100644 --- a/core/java/android/nfc/cardemulation/CardEmulation.java +++ b/core/java/android/nfc/cardemulation/CardEmulation.java @@ -265,12 +265,16 @@ public final class CardEmulation { * @return whether AIDs in the category can be handled by a service * specified by the foreground app. */ + @SuppressWarnings("NonUserGetterCalled") public boolean categoryAllowsForegroundPreference(String category) { if (CATEGORY_PAYMENT.equals(category)) { boolean preferForeground = false; + Context contextAsUser = mContext.createContextAsUser( + UserHandle.of(UserHandle.myUserId()), 0); try { - preferForeground = Settings.Secure.getIntForUser(mContext.getContentResolver(), - Settings.Secure.NFC_PAYMENT_FOREGROUND, UserHandle.myUserId()) != 0; + preferForeground = Settings.Secure.getInt( + contextAsUser.getContentResolver(), + Settings.Secure.NFC_PAYMENT_FOREGROUND) != 0; } catch (SettingNotFoundException e) { } return preferForeground;