Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update VirtualDeviceManager.ActivityCallback API" into tm-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2022-03-03 00:08:27 +00:00
committed by Android (Google) Code Review
parent 3dee9e9f0c 79b6c1cb92
commit 6c6f6bd6d5
3 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/api/system-current.txt
View File

@@ -2808,8 +2808,7 @@ package android.companion.virtual {
} }
public static class VirtualDeviceManager.VirtualDevice implements java.lang.AutoCloseable { public static class VirtualDeviceManager.VirtualDevice implements java.lang.AutoCloseable {
method public void addActivityListener(@NonNull android.companion.virtual.VirtualDeviceManager.ActivityListener); method public void addActivityListener(@NonNull java.util.concurrent.Executor, @NonNull android.companion.virtual.VirtualDeviceManager.ActivityListener);
method public void addActivityListener(@NonNull android.companion.virtual.VirtualDeviceManager.ActivityListener, @NonNull java.util.concurrent.Executor);
method @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public void close(); method @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public void close();
method @NonNull @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public android.companion.virtual.audio.VirtualAudioDevice createVirtualAudioDevice(@NonNull android.hardware.display.VirtualDisplay, @Nullable java.util.concurrent.Executor, @Nullable android.companion.virtual.audio.VirtualAudioDevice.AudioConfigurationChangeCallback); method @NonNull @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public android.companion.virtual.audio.VirtualAudioDevice createVirtualAudioDevice(@NonNull android.hardware.display.VirtualDisplay, @Nullable java.util.concurrent.Executor, @Nullable android.companion.virtual.audio.VirtualAudioDevice.AudioConfigurationChangeCallback);
method @Nullable public android.hardware.display.VirtualDisplay createVirtualDisplay(@IntRange(from=1) int, @IntRange(from=1) int, @IntRange(from=1) int, @Nullable android.view.Surface, int, @Nullable java.util.concurrent.Executor, @Nullable android.hardware.display.VirtualDisplay.Callback); method @Nullable public android.hardware.display.VirtualDisplay createVirtualDisplay(@IntRange(from=1) int, @IntRange(from=1) int, @IntRange(from=1) int, @Nullable android.view.Surface, int, @Nullable java.util.concurrent.Executor, @Nullable android.hardware.display.VirtualDisplay.Callback);

1
core/java/android/companion/virtual/IVirtualDeviceManager.aidl
View File

@@ -37,6 +37,7 @@ interface IVirtualDeviceManager {
* CDM. Virtual devices must have a corresponding association with CDM in order to be created. * CDM. Virtual devices must have a corresponding association with CDM in order to be created.
* @param params The parameters for creating this virtual device. See {@link * @param params The parameters for creating this virtual device. See {@link
* VirtualDeviceManager.VirtualDeviceParams}. * VirtualDeviceManager.VirtualDeviceParams}.
* @param activityListener The listener to listen for activity changes in a virtual device.
*/ */
IVirtualDevice createVirtualDevice( IVirtualDevice createVirtualDevice(
in IBinder token, String packageName, int associationId, in IBinder token, String packageName, int associationId,

15
core/java/android/companion/virtual/VirtualDeviceManager.java
View File

@@ -425,23 +425,12 @@ public final class VirtualDeviceManager {
* Adds an activity listener to listen for events such as top activity change or virtual * Adds an activity listener to listen for events such as top activity change or virtual
* display task stack became empty. * display task stack became empty.
* *
* @param executor The executor where the listener is executed on.
* @param listener The listener to add. * @param listener The listener to add.
* @see #removeActivityListener(ActivityListener) * @see #removeActivityListener(ActivityListener)
*/ */
public void addActivityListener(@NonNull ActivityListener listener) {
addActivityListener(listener, mContext.getMainExecutor());
}
/**
* Adds an activity listener to listen for events such as top activity change or virtual
* display task stack became empty.
*
* @param listener The listener to add.
* @param executor The executor where the callback is executed on.
* @see #removeActivityListener(ActivityListener)
*/
public void addActivityListener( public void addActivityListener(
@NonNull ActivityListener listener, @NonNull Executor executor) { @CallbackExecutor @NonNull Executor executor, @NonNull ActivityListener listener) {
mActivityListeners.put(listener, new ActivityListenerDelegate(listener, executor)); mActivityListeners.put(listener, new ActivityListenerDelegate(listener, executor));
} }