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

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

Merge "nfc: Add New API to get the list of active NFCEE" into main am: caed81a2 am: 2feacce1 

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



Change-Id: I8e7ceb69a6e895028f4d72a2ef63103344d41a2d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2ef7568e 2feacce1

nfc/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ package android.nfc { 


  @FlaggedApi("android.nfc.nfc_oem_extension") public final class NfcOemExtension {

    method @FlaggedApi("android.nfc.nfc_oem_extension") @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public void clearPreference();

    method @FlaggedApi("android.nfc.nfc_oem_extension") @NonNull public java.util.List<java.lang.String> getActiveNfceeList();

    method @FlaggedApi("android.nfc.nfc_oem_extension") @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public void maybeTriggerFirmwareUpdate();

    method @FlaggedApi("android.nfc.nfc_oem_extension") @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public void registerCallback(@NonNull java.util.concurrent.Executor, @NonNull android.nfc.NfcOemExtension.Callback);

    method @FlaggedApi("android.nfc.nfc_oem_extension") @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public void synchronizeScreenState();

nfc/java/android/nfc/INfcAdapter.aidl

+1 −0
Original line number Diff line number Diff line
@@ -113,4 +113,5 @@ interface INfcAdapter 
    void clearPreference();

    void setScreenState();

    void checkFirmware();

    List<String> fetchActiveNfceeList();

}

nfc/java/android/nfc/NfcOemExtension.java

+15 −0
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ import android.os.Binder; 
import android.os.RemoteException;

import android.util.Log;



import java.util.ArrayList;

import java.util.List;

import java.util.concurrent.Executor;



/**
@@ -153,6 +155,19 @@ public final class NfcOemExtension { 
        NfcAdapter.callService(() -> NfcAdapter.sService.checkFirmware());

    }



    /**

     * Get the Active NFCEE (NFC Execution Environment) List

     *

     * @return List of activated secure elements on success

     *         which can contain "eSE" and "UICC", otherwise empty list.

     */

    @NonNull

    @FlaggedApi(Flags.FLAG_NFC_OEM_EXTENSION)

    public List<String> getActiveNfceeList() {

        return NfcAdapter.callServiceReturn(() ->

            NfcAdapter.sService.fetchActiveNfceeList(), new ArrayList<String>());

    }



    private final class NfcOemExtensionCallback extends INfcOemExtensionCallback.Stub {

        @Override

        public void onTagConnected(boolean connected, Tag tag) throws RemoteException {