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

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

Merge "Make timeout optional for pausePolling & also resumePolling only if not... 

Merge "Make timeout optional for pausePolling & also resumePolling only if not started" into main am: 5428389c

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



Change-Id: I556390822c225ea54c0254685ba0ee79bfdbce2c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 20365558 5428389c

nfc/java/android/nfc/NfcAdapter.java

+5 −5
Original line number Diff line number Diff line
@@ -1150,8 +1150,9 @@ public final class NfcAdapter { 
    }



    /**

     * Pauses polling for a {@code timeoutInMs} millis. If polling must be resumed before timeout,

     * use {@link #resumePolling()}.

     * Pauses NFC tag reader mode polling for a {@code timeoutInMs} millisecond.

     * In case of {@code timeoutInMs} is zero or invalid polling will be stopped indefinitely

     * use {@link #resumePolling() to resume the polling.

     * @hide

     */

    public void pausePolling(int timeoutInMs) {
@@ -1210,9 +1211,8 @@ public final class NfcAdapter { 
    }



    /**

     * Resumes default polling for the current device state if polling is paused. Calling

     * this while polling is not paused is a no-op.

     *

     * Resumes default NFC tag reader mode polling for the current device state if polling is

     * paused. Calling this while already in polling is a no-op.

     * @hide

     */

    public void resumePolling() {

nfc/java/android/nfc/NfcOemExtension.java

+4 −3
Original line number Diff line number Diff line
@@ -569,8 +569,9 @@ public final class NfcOemExtension { 
    }



    /**

     * Pauses NFC tag reader mode polling for a {@code timeoutInMs} millisecond. If polling must be

     * resumed before timeout, use {@link #resumePolling()}.

     * Pauses NFC tag reader mode polling for a {@code timeoutInMs} millisecond.

     * In case of {@code timeoutInMs} is zero or invalid polling will be stopped indefinitely

     * use {@link #resumePolling() to resume the polling.

     * @param timeoutInMs the pause polling duration in millisecond

     */

    @FlaggedApi(Flags.FLAG_NFC_OEM_EXTENSION)
@@ -581,7 +582,7 @@ public final class NfcOemExtension { 


    /**

     * Resumes default NFC tag reader mode polling for the current device state if polling is

     * paused. Calling this while polling is not paused is a no-op.

     * paused. Calling this while already in polling is a no-op.

     */

    @FlaggedApi(Flags.FLAG_NFC_OEM_EXTENSION)

    @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS)