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

Commit f9e52140 authored by Maurice Lam's avatar Maurice Lam
Browse files

Unhide VDM activity APIs 

Unhiding VDM activity listener and launchPendingIntent APIs.

Bug: 194949534
Test: ag/15781910
CTS-Coverage-Bug: 204606917
Change-Id: I7c8b80cf8ed99d1c2931084840b5cd4428c5b285
parent d5b09e89

core/api/system-current.txt

+14 −0
Original line number Diff line number Diff line
@@ -2761,12 +2761,26 @@ package android.companion.virtual { 
    method @Nullable @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public android.companion.virtual.VirtualDeviceManager.VirtualDevice createVirtualDevice(int, @NonNull android.companion.virtual.VirtualDeviceParams);

  }













  public static interface VirtualDeviceManager.ActivityListener {













    method public void onDisplayEmpty(int);













    method public void onTopActivityChanged(int, @NonNull android.content.ComponentName);













  }

























  public static interface VirtualDeviceManager.LaunchCallback {













    method public void onLaunchFailed();













    method public void onLaunchSuccess();













  }



























  public static class VirtualDeviceManager.VirtualDevice implements java.lang.AutoCloseable {













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













    method public void addActivityListener(@NonNull android.companion.virtual.VirtualDeviceManager.ActivityListener, @NonNull java.util.concurrent.Executor);















    method public void close();















    method @Nullable public android.hardware.display.VirtualDisplay createVirtualDisplay(int, int, int, @Nullable android.view.Surface, int, @Nullable android.os.Handler, @Nullable android.hardware.display.VirtualDisplay.Callback);















    method @NonNull @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public android.hardware.input.VirtualKeyboard createVirtualKeyboard(@NonNull android.hardware.display.VirtualDisplay, @NonNull String, int, int);















    method @NonNull @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public android.hardware.input.VirtualMouse createVirtualMouse(@NonNull android.hardware.display.VirtualDisplay, @NonNull String, int, int);















    method @NonNull @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public android.hardware.input.VirtualTouchscreen createVirtualTouchscreen(@NonNull android.hardware.display.VirtualDisplay, @NonNull String, int, int);













    method public void launchPendingIntent(int, @NonNull android.app.PendingIntent, @NonNull java.util.concurrent.Executor, @NonNull android.companion.virtual.VirtualDeviceManager.LaunchCallback);













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















  }





























  public final class VirtualDeviceParams implements android.os.Parcelable {

























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



+0
−14




























Original line number
Diff line number
Diff line








@@ -164,8 +164,6 @@ public final class VirtualDeviceManager {













         * @param executor The executor to run {@code launchCallback} on.















         * @param launchCallback Callback that is called when the pending intent launching is















         *   complete.













         *













         * @hide















         */















        public void launchPendingIntent(















                int displayId,










@@ -369,9 +367,7 @@ public final class VirtualDeviceManager {













         *















         * @param listener The listener to add.















         * @see #removeActivityListener(ActivityListener)













         * @hide















         */













        // TODO(b/194949534): Unhide this API















        public void addActivityListener(@NonNull ActivityListener listener) {















            addActivityListener(listener, mContext.getMainExecutor());















        }









@@ -383,9 +379,7 @@ public final class VirtualDeviceManager {













         * @param listener The listener to add.















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















         * @see #removeActivityListener(ActivityListener)













         * @hide















         */













        // TODO(b/194949534): Unhide this API















        public void addActivityListener(















                @NonNull ActivityListener listener, @NonNull Executor executor) {















            mActivityListeners.put(listener, new ActivityListenerDelegate(listener, executor));









@@ -397,9 +391,7 @@ public final class VirtualDeviceManager {













         *















         * @param listener The listener to remove.















         * @see #addActivityListener(ActivityListener, Executor)













         * @hide















         */













        // TODO(b/194949534): Unhide this API















        public void removeActivityListener(@NonNull ActivityListener listener) {















            mActivityListeners.remove(listener);















        }









@@ -407,10 +399,7 @@ public final class VirtualDeviceManager {





























    /**















     * Callback for launching pending intents on the virtual device.













     *













     * @hide















     */













    // TODO(b/194949534): Unhide this API















    public interface LaunchCallback {















        /**















         * Called when the pending intent launched successfully.









@@ -425,10 +414,7 @@ public final class VirtualDeviceManager {





























    /**















     * Listener for activity changes in this virtual device.













     *













     * @hide















     */













    // TODO(b/194949534): Unhide this API















    public interface ActivityListener {































        /**