commit 31b73ad4b9d200f308cf0ae444fcda41f533acce
author Treehugger Robot <treehugger-gerrit@google.com> Fri Feb 10 22:13:43 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Feb 10 22:13:43 2023 +0000
tree 61815820910d4984a0d8d9f0b1386b6159bfee88
parent cbab36cc48c9af23bdfc16ea1b3d7f203c3f4210
parent 8ef8e4ea24037b62fa5749034b9506455fde3501

Merge "nfc: Migrate away from @hide getIntForUser"

core/java/android/nfc/cardemulation/CardEmulation.java

diff --git a/core/java/android/nfc/cardemulation/CardEmulation.java b/core/java/android/nfc/cardemulation/CardEmulation.java
index 6a42091..ac3344e 100644
--- a/core/java/android/nfc/cardemulation/CardEmulation.java
+++ b/core/java/android/nfc/cardemulation/CardEmulation.java
@@ -265,12 +265,16 @@
      * @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;