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

am e73b41b2: camera2: Remove prior repeating request when setting.

Browse Source 
* commit 'e73b41b27f16b160cfe49bdcac3091dce94229ae':
  camera2: Remove prior repeating request when setting.
This commit is contained in:
Ruben Brunk
2013-11-08 10:06:32 -08:00
committed by Android Git Automerger
parent d66cbc0bb2 e73b41b27f
commit 70285910ab
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/impl/CameraDevice.java
View File

@@ -279,6 +279,10 @@ public class CameraDevice implements android.hardware.camera2.CameraDevice {
checkIfCameraClosed();
int requestId;
if (repeating) {
stopRepeating();
}
try {
requestId = mRemoteDevice.submitRequest(request, repeating);
} catch (CameraRuntimeException e) {
@@ -293,10 +297,6 @@ public class CameraDevice implements android.hardware.camera2.CameraDevice {
}
if (repeating) {
// Queue for deletion after in-flight requests finish
if (mRepeatingRequestId != REQUEST_ID_NONE) {
mRepeatingRequestIdDeletedList.add(mRepeatingRequestId);
}
mRepeatingRequestId = requestId;
}