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

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

Merge "nfc(api): Use settings key and feature string since the API is @hide"... 

Merge "nfc(api): Use settings key and feature string since the API is @hide" into main am: f6214326

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



Change-Id: I790410acce8f6e7e8f070568c39dd686034e756d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5a0afb14 f6214326

core/java/android/nfc/Constants.java

0 → 100644
+29 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2023 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package android.nfc;



/**

 * @hide

 * TODO(b/303286040): Holds @hide API constants. Formalize these APIs.

 */

public final class Constants {

    private Constants() { }



    public static final String SETTINGS_SECURE_NFC_PAYMENT_FOREGROUND = "nfc_payment_foreground";

    public static final String SETTINGS_SECURE_NFC_PAYMENT_DEFAULT_COMPONENT = "nfc_payment_default_component";

    public static final String FEATURE_NFC_ANY = "android.hardware.nfc.any";

}

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

+2 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import android.content.ComponentName; 
import android.content.Context;

import android.content.Intent;

import android.content.pm.PackageManager;

import android.nfc.Constants;

import android.nfc.INfcCardEmulation;

import android.nfc.NfcAdapter;

import android.os.RemoteException;
@@ -274,7 +275,7 @@ public final class CardEmulation { 
            try {

                preferForeground = Settings.Secure.getInt(

                        contextAsUser.getContentResolver(),

                        Settings.Secure.NFC_PAYMENT_FOREGROUND) != 0;

                        Constants.SETTINGS_SECURE_NFC_PAYMENT_FOREGROUND) != 0;

            } catch (SettingNotFoundException e) {

            }

            return preferForeground;