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

Commit 5e3c3aa4 authored by Ruben Brunk's avatar Ruben Brunk
Browse files

DO NOT MERGE: Javadoc fix. 

Bug: 15189630

Change-Id: I4644ec782e636104fc06a27716f2fd224003e8d2
(cherry picked from commit 0a03a2ab50b665d382f92a1219177c3bd6fc568b)
parent d3024154

core/java/android/hardware/camera2/legacy/CameraDeviceState.java

+4 −4
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ public class CameraDeviceState { 
     * {@link CameraDeviceStateListener#onConfiguring()} will be called.

     * </p>

     *

     * @returns {@link CameraBinderDecorator#NO_ERROR}, or an error if one has occurred.

     * @return {@link CameraBinderDecorator#NO_ERROR}, or an error if one has occurred.

     */

    public synchronized int setConfiguring() {

        doStateTransition(STATE_CONFIGURING);
@@ -108,7 +108,7 @@ public class CameraDeviceState { 
     * {@link CameraDeviceStateListener#onIdle()} will be called.

     * </p>

     *

     * @returns {@link CameraBinderDecorator#NO_ERROR}, or an error if one has occurred.

     * @return {@link CameraBinderDecorator#NO_ERROR}, or an error if one has occurred.

     */

    public synchronized int setIdle() {

        doStateTransition(STATE_IDLE);
@@ -124,7 +124,7 @@ public class CameraDeviceState { 
     * </p>

     *

     * @param request A {@link RequestHolder} containing the request for the current capture.

     * @returns {@link CameraBinderDecorator#NO_ERROR}, or an error if one has occurred.

     * @return {@link CameraBinderDecorator#NO_ERROR}, or an error if one has occurred.

     */

    public synchronized int setCaptureStart(final RequestHolder request) {

        mCurrentRequest = request;
@@ -144,7 +144,7 @@ public class CameraDeviceState { 
     *

     * @param request the {@link RequestHolder} request that created this result.

     * @param result the {@link CameraMetadataNative} result to set.

     * @returns {@link CameraBinderDecorator#NO_ERROR}, or an error if one has occurred.

     * @return {@link CameraBinderDecorator#NO_ERROR}, or an error if one has occurred.

     */

    public synchronized int setCaptureResult(final RequestHolder request,

                                             final CameraMetadataNative result) {