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

Commit de5f5361 authored by Shaun Corkran's avatar Shaun Corkran Committed by Android (Google) Code Review
Browse files

Merge "[API Review] Update parameter ordering in intent interception API next to callback"

parents 0f6af4e8 775e6e4a

core/api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -3025,7 +3025,7 @@ package android.companion.virtual { 
    method public int getDeviceId();

    method @Nullable public android.companion.virtual.sensor.VirtualSensor getVirtualSensor(int, @NonNull String);

    method public void launchPendingIntent(int, @NonNull android.app.PendingIntent, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.IntConsumer);

    method @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public void registerIntentInterceptor(@NonNull java.util.concurrent.Executor, @NonNull android.content.IntentFilter, @NonNull android.companion.virtual.VirtualDeviceManager.IntentInterceptorCallback);

    method @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public void registerIntentInterceptor(@NonNull android.content.IntentFilter, @NonNull java.util.concurrent.Executor, @NonNull android.companion.virtual.VirtualDeviceManager.IntentInterceptorCallback);

    method public void removeActivityListener(@NonNull android.companion.virtual.VirtualDeviceManager.ActivityListener);

    method @NonNull @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public void setShowPointerIcon(boolean);

    method @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public void unregisterIntentInterceptor(@NonNull android.companion.virtual.VirtualDeviceManager.IntentInterceptorCallback);

core/java/android/companion/virtual/VirtualDeviceManager.java

+2 −2
Original line number Diff line number Diff line
@@ -931,16 +931,16 @@ public final class VirtualDeviceManager { 
         * when matching the provided IntentFilter and calls the callback with the intercepted

         * intent.

         *

         * @param executor The executor where the interceptor is executed on.

         * @param interceptorFilter The filter to match intents intended for interception.

         * @param executor The executor where the interceptor is executed on.

         * @param interceptorCallback The callback called when an intent matching interceptorFilter

         * is intercepted.

         * @see #unregisterIntentInterceptor(IntentInterceptorCallback)

         */

        @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE)

        public void registerIntentInterceptor(

                @CallbackExecutor @NonNull Executor executor,

                @NonNull IntentFilter interceptorFilter,

                @CallbackExecutor @NonNull Executor executor,

                @NonNull IntentInterceptorCallback interceptorCallback) {

            Objects.requireNonNull(executor);

            Objects.requireNonNull(interceptorFilter);