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

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

Merge "A warning added to setDiscoveryTechnology() API" into main am: b97f9452 

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



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

nfc/java/android/nfc/NfcAdapter.java

+5 −0
Original line number Diff line number Diff line
@@ -1789,6 +1789,11 @@ public final class NfcAdapter { 
     * @param listenTechnology Flags indicating listen technologies.

     * @throws UnsupportedOperationException if FEATURE_NFC,

     * FEATURE_NFC_HOST_CARD_EMULATION, FEATURE_NFC_HOST_CARD_EMULATION_NFCF are unavailable.

     *

     * NOTE: This API overrides all technology flags regardless of the current device state,

     *       it is incompatible with enableReaderMode() API and the others that either update

     *       or assume any techlology flag set by the OS.

     *       Please use with care.

     */



    @FlaggedApi(Flags.FLAG_ENABLE_NFC_SET_DISCOVERY_TECH)