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

Commit ac2f252e authored by Roshan Pius's avatar Roshan Pius Committed by Automerger Merge Worker
Browse files

Merge "settings: Remove @hide NFC API usage" into main am: 75a49e0a am: da054981 

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2851159



Change-Id: Iadfb1f67802dbec8ff68271d7199ca83edd3b9bb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a9007d74 da054981

Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ android_library { 
        "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

+2 −7
Original line number Diff line number Diff line
@@ -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 @@ public class PaymentSettingsEnabler extends BaseNfcEnabler { 
    }



    private boolean hasAnyServices() {

        if (Flags.enableNfcMainline()) {

        return mCardEmuManager.getServices(

            CardEmulation.CATEGORY_PAYMENT, UserHandle.myUserId()).isEmpty();

        } else {

            return mCardEmuManager.getServices(CardEmulation.CATEGORY_PAYMENT).isEmpty();

        }

    }



    @Override