summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2018-06-23 00:11:04 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2018-06-23 00:11:04 +0000
commita749cd584e8f5320e0c1ecc77edd5c2b13cc6d29 (patch)
tree0ecf1e1774826a409488a2e086a6ffa907d33810
parentd2aadbfd93699b8cc2c4d62bd526df0a6eaa1356 (diff)
parent470c698c5a16d85b3492415fd1ba4abf3540f0de (diff)
Merge "Camera: Update surface sharing format restrictions" into pi-dev
-rw-r--r--core/java/android/hardware/camera2/params/OutputConfiguration.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/hardware/camera2/params/OutputConfiguration.java b/core/java/android/hardware/camera2/params/OutputConfiguration.java
index a040a09cf469..1ee3c933b326 100644
--- a/core/java/android/hardware/camera2/params/OutputConfiguration.java
+++ b/core/java/android/hardware/camera2/params/OutputConfiguration.java
@@ -82,9 +82,9 @@ import java.util.List;
*
* </ul>
*
- * <p> As of {@link android.os.Build.VERSION_CODES#P Android P}, all formats can be used for
- * sharing, subject to device support. On prior API levels, only {@link ImageFormat#PRIVATE}
- * format may be used.</p>
+ * <p> As of {@link android.os.Build.VERSION_CODES#P Android P}, all formats except
+ * {@link ImageFormat#JPEG} and {@link ImageFormat#RAW_PRIVATE} can be used for sharing, subject to
+ * device support. On prior API levels, only {@link ImageFormat#PRIVATE} format may be used.</p>
*
* @see CameraDevice#createCaptureSessionByOutputConfigurations
*