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

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

Merge "nfc(api): Add return status for pause/resume Polling APIs" into main... 

Merge "nfc(api): Add return status for pause/resume Polling APIs" into main am: 715f07ff am: a24c2730

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



Change-Id: Idf793748fb091f3fcc43e38f7053efe298babc68
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 706e74bf a24c2730

nfc/api/system-current.txt

+4 −2
Original line number Diff line number Diff line
@@ -65,9 +65,9 @@ package android.nfc { 
    method @FlaggedApi("android.nfc.nfc_oem_extension") @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public boolean isTagPresent();

    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 overwriteRoutingTable(int, int, int, int);

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

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

    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 resumePolling();

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

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

    method @FlaggedApi("android.nfc.nfc_oem_extension") @RequiresPermission(android.Manifest.permission.NFC_SET_CONTROLLER_ALWAYS_ON) public void setControllerAlwaysOnMode(int);

    method @FlaggedApi("android.nfc.nfc_oem_extension") @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public void synchronizeScreenState();
@@ -83,6 +83,8 @@ package android.nfc { 
    field public static final int HCE_ACTIVATE = 1; // 0x1

    field public static final int HCE_DATA_TRANSFERRED = 2; // 0x2

    field public static final int HCE_DEACTIVATE = 3; // 0x3

    field public static final int POLLING_STATE_CHANGE_ALREADY_IN_REQUESTED_STATE = 2; // 0x2

    field public static final int POLLING_STATE_CHANGE_SUCCEEDED = 1; // 0x1

    field public static final int STATUS_OK = 0; // 0x0

    field public static final int STATUS_UNKNOWN_ERROR = 1; // 0x1

  }

nfc/java/android/nfc/INfcAdapter.aidl

+2 −2
Original line number Diff line number Diff line
@@ -52,8 +52,8 @@ interface INfcAdapter 
    int getState();

    boolean disable(boolean saveState, in String pkg);

    boolean enable(in String pkg);

    void pausePolling(int timeoutInMs);

    void resumePolling();

    int pausePolling(int timeoutInMs);

    int resumePolling();



    void setForegroundDispatch(in PendingIntent intent,

            in IntentFilter[] filters, in TechListParcel techLists);

nfc/java/android/nfc/NfcOemExtension.java

+39 −6
Original line number Diff line number Diff line
@@ -172,6 +172,31 @@ public final class NfcOemExtension { 
    @Retention(RetentionPolicy.SOURCE)

    public @interface HostCardEmulationAction {}



    /**

     * Status code returned when the polling state change request succeeded.

     * @see #pausePolling()

     * @see #resumePolling()

     */

    public static final int POLLING_STATE_CHANGE_SUCCEEDED = 1;

    /**

     * Status code returned when the polling state change request is already in

     * required state.

     * @see #pausePolling()

     * @see #resumePolling()

     */

    public static final int POLLING_STATE_CHANGE_ALREADY_IN_REQUESTED_STATE = 2;

    /**

     * Possible status codes for {@link #pausePolling()} and

     * {@link #resumePolling()}.

     * @hide

     */

    @IntDef(value = {

            POLLING_STATE_CHANGE_SUCCEEDED,

            POLLING_STATE_CHANGE_ALREADY_IN_REQUESTED_STATE,

    })

    @Retention(RetentionPolicy.SOURCE)

    public @interface PollingStateChangeStatusCode {}



    /**

     * Status OK

     */
@@ -653,24 +678,32 @@ public final class NfcOemExtension { 


    /**

     * 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.

     * 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, ranging from 0 to 40000.

     * @return status of the operation

     * @throws IllegalArgumentException if timeoutInMs value is invalid

     *         (0 < timeoutInMs < max).

     */

    @FlaggedApi(Flags.FLAG_NFC_OEM_EXTENSION)

    @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS)

    public void pausePolling(@DurationMillisLong int timeoutInMs) {

        NfcAdapter.callService(() -> NfcAdapter.sService.pausePolling(timeoutInMs));

    public @PollingStateChangeStatusCode int pausePolling(@DurationMillisLong int timeoutInMs) {

        return NfcAdapter.callServiceReturn(() ->

                NfcAdapter.sService.pausePolling(timeoutInMs),

                POLLING_STATE_CHANGE_ALREADY_IN_REQUESTED_STATE);

    }



    /**

     * 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.

     * @return status of the operation

     */

    @FlaggedApi(Flags.FLAG_NFC_OEM_EXTENSION)

    @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS)

    public void resumePolling() {

        NfcAdapter.callService(() -> NfcAdapter.sService.resumePolling());

    public @PollingStateChangeStatusCode int resumePolling() {

        return NfcAdapter.callServiceReturn(() ->

                NfcAdapter.sService.resumePolling(),

                POLLING_STATE_CHANGE_ALREADY_IN_REQUESTED_STATE);

    }



    /**