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

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

Merge "[framework] rename some oemCallback and fix javadoc typo." into main am: 59a332c5 

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



Change-Id: I6fe233fe21160a7582f0c8b32aeae231380e344b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d540ee85 59a332c5

nfc/api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -89,12 +89,12 @@ package android.nfc { 
    method public void onBootFinished(int);

    method public void onBootStarted();

    method public void onCardEmulationActivated(boolean);

    method public void onDisable(@NonNull java.util.function.Consumer<java.lang.Boolean>);

    method public void onDisableFinished(int);

    method public void onDisableRequested(@NonNull java.util.function.Consumer<java.lang.Boolean>);

    method public void onDisableStarted();

    method public void onEeListenActivated(boolean);

    method public void onEnable(@NonNull java.util.function.Consumer<java.lang.Boolean>);

    method public void onEnableFinished(int);

    method public void onEnableRequested(@NonNull java.util.function.Consumer<java.lang.Boolean>);

    method public void onEnableStarted();

    method public void onGetOemAppSearchIntent(@NonNull java.util.List<java.lang.String>, @NonNull java.util.function.Consumer<android.content.Intent>);

    method public void onHceEventReceived(int);

nfc/java/android/nfc/NfcOemExtension.java

+5 −7
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ import android.annotation.FlaggedApi; 
import android.annotation.IntDef;

import android.annotation.NonNull;

import android.annotation.RequiresPermission;

import android.annotation.SuppressLint;

import android.annotation.SystemApi;

import android.content.ComponentName;

import android.content.Context;
@@ -233,8 +232,7 @@ public final class NfcOemExtension { 
         *                  {@link Boolean#TRUE}, otherwise call with {@link Boolean#FALSE}.

         * false if NFC cannot be enabled at this time.

         */

        @SuppressLint("MethodNameTense")

        void onEnable(@NonNull Consumer<Boolean> isAllowed);

        void onEnableRequested(@NonNull Consumer<Boolean> isAllowed);

        /**

         * Method to check if Nfc is allowed to be disabled by OEMs.

         * @param isAllowed The {@link Consumer} to be completed. If disabling NFC is allowed,
@@ -242,7 +240,7 @@ public final class NfcOemExtension { 
         *                  {@link Boolean#TRUE}, otherwise call with {@link Boolean#FALSE}.

         * false if NFC cannot be disabled at this time.

         */

        void onDisable(@NonNull Consumer<Boolean> isAllowed);

        void onDisableRequested(@NonNull Consumer<Boolean> isAllowed);



        /**

         * Callback to indicate that Nfc starts to boot.
@@ -255,7 +253,7 @@ public final class NfcOemExtension { 
        void onEnableStarted();



        /**

         * Callback to indicate that Nfc starts to enable.

         * Callback to indicate that Nfc starts to disable.

         */

        void onDisableStarted();
@@ -799,13 +797,13 @@ public final class NfcOemExtension { 
        public void onEnable(ResultReceiver isAllowed) throws RemoteException {

            mCallbackMap.forEach((cb, ex) ->

                    handleVoidCallback(

                        new ReceiverWrapper<>(isAllowed), cb::onEnable, ex));

                        new ReceiverWrapper<>(isAllowed), cb::onEnableRequested, ex));

        }

        @Override

        public void onDisable(ResultReceiver isAllowed) throws RemoteException {

            mCallbackMap.forEach((cb, ex) ->

                    handleVoidCallback(

                        new ReceiverWrapper<>(isAllowed), cb::onDisable, ex));

                        new ReceiverWrapper<>(isAllowed), cb::onDisableRequested, ex));

        }

        @Override

        public void onBootStarted() throws RemoteException {