Merge "Update VirtualDeviceManager.ActivityCallback API" into tm-dev (6c6f6bd6) · Commits · e / os / android_frameworks_base

core/api/system-current.txt

+1 −2

Original line number	Diff line number	Diff line
		@@ -2808,8 +2808,7 @@ package android.companion.virtual {
		}

		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 addActivityListener(@NonNull java.util.concurrent.Executor, @NonNull android.companion.virtual.VirtualDeviceManager.ActivityListener);
		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 @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 −0

Original line number	Diff line number	Diff line
		@@ -37,6 +37,7 @@ interface IVirtualDeviceManager {
		* 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
		* VirtualDeviceManager.VirtualDeviceParams}.
		* @param activityListener The listener to listen for activity changes in a virtual device.
		*/
		IVirtualDevice createVirtualDevice(
		in IBinder token, String packageName, int associationId,

+2 −13

Original line number	Diff line number	Diff line
		@@ -425,23 +425,12 @@ public final class VirtualDeviceManager {
		* Adds an activity listener to listen for events such as top activity change or virtual
		* display task stack became empty.
		*
		* @param executor The executor where the listener is executed on.
		* @param listener The listener to add.
		* @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(
		@NonNull ActivityListener listener, @NonNull Executor executor) {
		@CallbackExecutor @NonNull Executor executor, @NonNull ActivityListener listener) {
		mActivityListeners.put(listener, new ActivityListenerDelegate(listener, executor));
		}