Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "DO NOT MERGE: Javadoc fix." into lmp-preview-dev

Browse Source
This commit is contained in:
Ruben Brunk
2014-05-23 20:02:00 +00:00
committed by Android (Google) Code Review
parent db9c3aee75 5e3c3aa44d
commit db67ffd62b
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/hardware/camera2/legacy/CameraDeviceState.java
View File

@@ -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) {