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

Commit c5c363f0 authored by Eino-Ville Talvala's avatar Eino-Ville Talvala Committed by Android Git Automerger
Browse files

am 14b5f131: Merge "camera2 docs: Fix instructions for using SurfaceView." into lmp-preview-dev 

* commit '14b5f131c7118d58a6215e1f6d877d5cd31de54c':
  camera2 docs: Fix instructions for using SurfaceView.
parents 22174803 fb587f4f

core/java/android/hardware/camera2/CameraDevice.java

+5 −4
Original line number Diff line number Diff line
@@ -154,10 +154,11 @@ public abstract class CameraDevice implements AutoCloseable { 
     *

     * <ul>

     *

     * <li>For drawing to a {@link android.view.SurfaceView SurfaceView}: Set the size of the

     *   Surface with {@link android.view.SurfaceHolder#setFixedSize} to be one of the sizes

     *   returned by

     *   {@link StreamConfigurationMap#getOutputSizes(Class) getOutputSizes(SurfaceView.class)}

     * <li>For drawing to a {@link android.view.SurfaceView SurfaceView}: Once the SurfaceView's

     *   Surface is {@link android.view.SurfaceHolder.Callback#surfaceCreated created}, set the

     *   size of the Surface with {@link android.view.SurfaceHolder#setFixedSize} to be one of the

     *   sizes returned by

     *   {@link StreamConfigurationMap#getOutputSizes(Class) getOutputSizes(SurfaceHolder.class)}

     *   and then obtain the Surface by calling {@link android.view.SurfaceHolder#getSurface}.</li>

     *

     * <li>For accessing through an OpenGL texture via a