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

Commit e983075b authored by Arthur Ishiguro's avatar Arthur Ishiguro
Browse files

Reorder argument names for endpoint discovery callback APIs 

Bug: 383758830
API-Coverage-Bug: 377554469
Flag: android.chre.flags.offload_api
Test: Compile
Change-Id: I7b173274338d0b4bf6dad9e0c30a229a2ad791fe
parent 8a3e9641

core/api/system-current.txt

+4 −4
Original line number Diff line number Diff line
@@ -6192,10 +6192,10 @@ package android.hardware.location { 
    method @Deprecated public int registerCallback(@NonNull android.hardware.location.ContextHubManager.Callback);

    method @Deprecated public int registerCallback(android.hardware.location.ContextHubManager.Callback, android.os.Handler);

    method @FlaggedApi("android.chre.flags.offload_api") @RequiresPermission(android.Manifest.permission.ACCESS_CONTEXT_HUB) public void registerEndpoint(@NonNull android.hardware.contexthub.HubEndpoint);

    method @FlaggedApi("android.chre.flags.offload_api") @RequiresPermission(android.Manifest.permission.ACCESS_CONTEXT_HUB) public void registerEndpointDiscoveryCallback(long, @NonNull android.hardware.contexthub.IHubEndpointDiscoveryCallback);

    method @FlaggedApi("android.chre.flags.offload_api") @RequiresPermission(android.Manifest.permission.ACCESS_CONTEXT_HUB) public void registerEndpointDiscoveryCallback(long, @NonNull android.hardware.contexthub.IHubEndpointDiscoveryCallback, @NonNull java.util.concurrent.Executor);

    method @FlaggedApi("android.chre.flags.offload_api") @RequiresPermission(android.Manifest.permission.ACCESS_CONTEXT_HUB) public void registerEndpointDiscoveryCallback(@NonNull String, @NonNull android.hardware.contexthub.IHubEndpointDiscoveryCallback);

    method @FlaggedApi("android.chre.flags.offload_api") @RequiresPermission(android.Manifest.permission.ACCESS_CONTEXT_HUB) public void registerEndpointDiscoveryCallback(@NonNull String, @NonNull android.hardware.contexthub.IHubEndpointDiscoveryCallback, @NonNull java.util.concurrent.Executor);

    method @FlaggedApi("android.chre.flags.offload_api") @RequiresPermission(android.Manifest.permission.ACCESS_CONTEXT_HUB) public void registerEndpointDiscoveryCallback(@NonNull android.hardware.contexthub.IHubEndpointDiscoveryCallback, long);

    method @FlaggedApi("android.chre.flags.offload_api") @RequiresPermission(android.Manifest.permission.ACCESS_CONTEXT_HUB) public void registerEndpointDiscoveryCallback(@NonNull java.util.concurrent.Executor, @NonNull android.hardware.contexthub.IHubEndpointDiscoveryCallback, long);

    method @FlaggedApi("android.chre.flags.offload_api") @RequiresPermission(android.Manifest.permission.ACCESS_CONTEXT_HUB) public void registerEndpointDiscoveryCallback(@NonNull android.hardware.contexthub.IHubEndpointDiscoveryCallback, @NonNull String);

    method @FlaggedApi("android.chre.flags.offload_api") @RequiresPermission(android.Manifest.permission.ACCESS_CONTEXT_HUB) public void registerEndpointDiscoveryCallback(@NonNull java.util.concurrent.Executor, @NonNull android.hardware.contexthub.IHubEndpointDiscoveryCallback, @NonNull String);

    method @Deprecated @RequiresPermission(android.Manifest.permission.ACCESS_CONTEXT_HUB) public int sendMessage(int, int, @NonNull android.hardware.location.ContextHubMessage);

    method @Deprecated @RequiresPermission(android.Manifest.permission.ACCESS_CONTEXT_HUB) public int unloadNanoApp(int);

    method @NonNull @RequiresPermission(android.Manifest.permission.ACCESS_CONTEXT_HUB) public android.hardware.location.ContextHubTransaction<java.lang.Void> unloadNanoApp(@NonNull android.hardware.location.ContextHubInfo, long);

core/java/android/hardware/location/ContextHubManager.java

+23 −22
Original line number Diff line number Diff line
@@ -750,14 +750,15 @@ public final class ContextHubManager { 
    /**

     * Creates an interface to invoke endpoint discovery callbacks to send down to the service.

     *

     * @param callback the callback to invoke at the client process

     * @param executor the executor to invoke callbacks for this client

     * @param callback the callback to invoke at the client process

     * @param serviceDescriptor an optional descriptor to match discovery list with

     * @return the callback interface

     */

    @FlaggedApi(Flags.FLAG_OFFLOAD_API)

    private IContextHubEndpointDiscoveryCallback createDiscoveryCallback(

            IHubEndpointDiscoveryCallback callback,

            Executor executor,

            IHubEndpointDiscoveryCallback callback,

            @Nullable String serviceDescriptor) {

        return new IContextHubEndpointDiscoveryCallback.Stub() {

            @Override
@@ -829,36 +830,36 @@ public final class ContextHubManager { 
    }



    /**

     * Equivalent to {@link #registerEndpointDiscoveryCallback(long, IHubEndpointDiscoveryCallback,

     * Executor)} with the default executor in the main thread.

     * Equivalent to {@link #registerEndpointDiscoveryCallback(Executor,

     * IHubEndpointDiscoveryCallback, long)} with the default executor in the main thread.

     */

    @RequiresPermission(android.Manifest.permission.ACCESS_CONTEXT_HUB)

    @FlaggedApi(Flags.FLAG_OFFLOAD_API)

    public void registerEndpointDiscoveryCallback(

            long endpointId, @NonNull IHubEndpointDiscoveryCallback callback) {

            @NonNull IHubEndpointDiscoveryCallback callback, long endpointId) {

        registerEndpointDiscoveryCallback(

                endpointId, callback, new HandlerExecutor(Handler.getMain()));

                new HandlerExecutor(Handler.getMain()), callback, endpointId);

    }



    /**

     * Registers a callback to be notified when the hub endpoint with the corresponding endpoint ID

     * has started or stopped.

     *

     * @param endpointId The identifier of the hub endpoint.

     * @param callback The callback to be invoked.

     * @param executor The executor to invoke the callback on.

     * @param callback The callback to be invoked.

     * @param endpointId The identifier of the hub endpoint.

     * @throws UnsupportedOperationException If the operation is not supported.

     */

    @RequiresPermission(android.Manifest.permission.ACCESS_CONTEXT_HUB)

    @FlaggedApi(Flags.FLAG_OFFLOAD_API)

    public void registerEndpointDiscoveryCallback(

            long endpointId,

            @NonNull Executor executor,

            @NonNull IHubEndpointDiscoveryCallback callback,

            @NonNull Executor executor) {

        Objects.requireNonNull(callback, "callback cannot be null");

            long endpointId) {

        Objects.requireNonNull(executor, "executor cannot be null");

        Objects.requireNonNull(callback, "callback cannot be null");

        IContextHubEndpointDiscoveryCallback iCallback =

                createDiscoveryCallback(callback, executor, null);

                createDiscoveryCallback(executor, callback, null);

        try {

            mService.registerEndpointDiscoveryCallbackId(endpointId, iCallback);

        } catch (RemoteException e) {
@@ -869,42 +870,42 @@ public final class ContextHubManager { 
    }



    /**

     * Equivalent to {@link #registerEndpointDiscoveryCallback(String,

     * IHubEndpointDiscoveryCallback, Executor)} with the default executor in the main thread.

     * Equivalent to {@link #registerEndpointDiscoveryCallback(Executor,

     * IHubEndpointDiscoveryCallback, String)} with the default executor in the main thread.

     */

    @RequiresPermission(android.Manifest.permission.ACCESS_CONTEXT_HUB)

    @FlaggedApi(Flags.FLAG_OFFLOAD_API)

    public void registerEndpointDiscoveryCallback(

            @NonNull String serviceDescriptor, @NonNull IHubEndpointDiscoveryCallback callback) {

            @NonNull IHubEndpointDiscoveryCallback callback, @NonNull String serviceDescriptor) {

        registerEndpointDiscoveryCallback(

                serviceDescriptor, callback, new HandlerExecutor(Handler.getMain()));

                new HandlerExecutor(Handler.getMain()), callback, serviceDescriptor);

    }



    /**

     * Registers a callback to be notified when the hub endpoint with the corresponding service

     * descriptor has started or stopped.

     *

     * @param executor The executor to invoke the callback on.

     * @param serviceDescriptor The service descriptor of the hub endpoint.

     * @param callback The callback to be invoked.

     * @param executor The executor to invoke the callback on.

     * @throws IllegalArgumentException if the serviceDescriptor is empty.

     * @throws UnsupportedOperationException If the operation is not supported.

     */

    @RequiresPermission(android.Manifest.permission.ACCESS_CONTEXT_HUB)

    @FlaggedApi(Flags.FLAG_OFFLOAD_API)

    public void registerEndpointDiscoveryCallback(

            @NonNull String serviceDescriptor,

            @NonNull Executor executor,

            @NonNull IHubEndpointDiscoveryCallback callback,

            @NonNull Executor executor) {

        Objects.requireNonNull(serviceDescriptor, "serviceDescriptor cannot be null");

        Objects.requireNonNull(callback, "callback cannot be null");

            @NonNull String serviceDescriptor) {

        Objects.requireNonNull(executor, "executor cannot be null");

        Objects.requireNonNull(callback, "callback cannot be null");

        Objects.requireNonNull(serviceDescriptor, "serviceDescriptor cannot be null");

        if (serviceDescriptor.isBlank()) {

            throw new IllegalArgumentException("Invalid service descriptor: " + serviceDescriptor);

        }



        IContextHubEndpointDiscoveryCallback iCallback =

                createDiscoveryCallback(callback, executor, serviceDescriptor);

                createDiscoveryCallback(executor, callback, serviceDescriptor);

        try {

            mService.registerEndpointDiscoveryCallbackDescriptor(serviceDescriptor, iCallback);

        } catch (RemoteException e) {