| commit | fe82275a06f0ace675482b23ee2cb685d2628af1 | [log] [tgz] |
|---|---|---|
| author | Eino-Ville Talvala <etalvala@google.com> | Wed Jun 29 00:54:38 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jun 29 00:54:38 2016 +0000 |
| tree | eb2270d84bdb4ba685ff8bf9cd11d195babb85e5 | |
| parent | fd75b28a114aeb5f4c02a3c5c8f41fc80051b354 [diff] | |
| parent | b889242affec0f669408f2ad58bd7fb3d44a05a2 [diff] |
Merge \"Camera3Device: Correctly shut down abandoned streams\" into nyc-dev am: b889242aff Change-Id: I50fd0619dec5488dbeadb903b95e5bd4e5980f61
diff --git a/services/camera/libcameraservice/device3/Camera3IOStreamBase.cpp b/services/camera/libcameraservice/device3/Camera3IOStreamBase.cpp index 4824974..cb39244 100644 --- a/services/camera/libcameraservice/device3/Camera3IOStreamBase.cpp +++ b/services/camera/libcameraservice/device3/Camera3IOStreamBase.cpp
@@ -124,6 +124,7 @@ switch (mState) { case STATE_IN_RECONFIG: case STATE_CONFIGURED: + case STATE_ABANDONED: // OK break; default:
diff --git a/services/camera/libcameraservice/device3/Camera3OutputStream.cpp b/services/camera/libcameraservice/device3/Camera3OutputStream.cpp index 3aff684..299435a 100644 --- a/services/camera/libcameraservice/device3/Camera3OutputStream.cpp +++ b/services/camera/libcameraservice/device3/Camera3OutputStream.cpp
@@ -653,9 +653,9 @@ *buffer = 0; ALOGW("%s: the released buffer has already been freed by the buffer queue!", __FUNCTION__); } else if (res != OK) { - // Other errors are fatal. + // Treat other errors as abandonment ALOGE("%s: detach next buffer failed: %s (%d).", __FUNCTION__, strerror(-res), res); - mState = STATE_ERROR; + mState = STATE_ABANDONED; return res; }