Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f295ce11 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "nfc: Migrate away from @hide getIntForUser" am: 31b73ad4 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2429196



Change-Id: I07cdb5217e1f505e56da043e5ef6195cdd4f981f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9ac35bd3 31b73ad4

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

+6 −2
Original line number Diff line number Diff line
@@ -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;