diff options
| author | 2023-06-20 16:55:48 +0000 | |
|---|---|---|
| committer | 2023-06-20 16:55:48 +0000 | |
| commit | c268174cb015afcfb216fde58235215e9583f1a1 (patch) | |
| tree | 2ba812d2c68d8671a380bd47eb53d2bda0ad8d60 | |
| parent | fa56ac80045b9d2c5ca27600d41c3586216b8962 (diff) | |
| parent | c130f1c173abc51c09e3222bc0e7616f50af5d6e (diff) | |
Merge "[MediaProjection] Clarify createVirtualDisplay flags javadoc" into udc-dev am: 833a6c895a am: c130f1c173
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23727669
Change-Id: I24895d40dad80a843a0c31d4e5c677d880eb5294
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | media/java/android/media/projection/MediaProjection.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/media/java/android/media/projection/MediaProjection.java b/media/java/android/media/projection/MediaProjection.java index f1cffb63af07..48367f92e8ab 100644 --- a/media/java/android/media/projection/MediaProjection.java +++ b/media/java/android/media/projection/MediaProjection.java @@ -159,7 +159,14 @@ public final class MediaProjection { * @param surface The surface to which the content of the virtual display should be rendered, * or null if there is none initially. * @param flags A combination of virtual display flags. See {@link DisplayManager} for the - * full list of flags. + * full list of flags. Note that + * {@link DisplayManager#VIRTUAL_DISPLAY_FLAG_PRESENTATION} + * is always enabled. The following flags may be overridden, depending on how + * the component with {android.Manifest.permission.MANAGE_MEDIA_PROJECTION} + * handles the user's consent: + * {@link DisplayManager#VIRTUAL_DISPLAY_FLAG_OWN_CONTENT_ONLY}, + * {@link DisplayManager#VIRTUAL_DISPLAY_FLAG_AUTO_MIRROR}, + * {@link DisplayManager#VIRTUAL_DISPLAY_FLAG_PUBLIC}. * @param callback Callback invoked when the virtual display's state changes, or null. * @param handler The {@link android.os.Handler} on which the callback should be invoked, or * null if the callback should be invoked on the calling thread's main |