diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2014-09-14 14:52:19 -0700 |
|---|---|---|
| committer | Eino-Ville Talvala <etalvala@google.com> | 2014-09-14 14:52:19 -0700 |
| commit | 9c8a091436052fb0f3290356abe1ac55b7bae8a2 (patch) | |
| tree | becf4b546244b1bed7ecb029795757be2e6bb219 /services/camera | |
| parent | 176e4c253a63d581af6b21f3182d71b3026ef516 (diff) | |
| download | frameworks_av-9c8a091436052fb0f3290356abe1ac55b7bae8a2.zip frameworks_av-9c8a091436052fb0f3290356abe1ac55b7bae8a2.tar.gz frameworks_av-9c8a091436052fb0f3290356abe1ac55b7bae8a2.tar.bz2 | |
Camera3Device: Treat failure to idle as an error
Bug: 16899526
Change-Id: Ia995aac6360c9c41ed654af5a7052480f23903d8
Diffstat (limited to 'services/camera')
| -rw-r--r-- | services/camera/libcameraservice/device3/Camera3Device.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/services/camera/libcameraservice/device3/Camera3Device.cpp b/services/camera/libcameraservice/device3/Camera3Device.cpp index fafe349..c3e41d3 100644 --- a/services/camera/libcameraservice/device3/Camera3Device.cpp +++ b/services/camera/libcameraservice/device3/Camera3Device.cpp @@ -1086,6 +1086,10 @@ status_t Camera3Device::waitUntilDrainedLocked() { ALOGV("%s: Camera %d: Waiting until idle", __FUNCTION__, mId); status_t res = waitUntilStateThenRelock(/*active*/ false, kShutdownTimeout); + if (res != OK) { + SET_ERR_L("Error waiting for HAL to drain: %s (%d)", strerror(-res), + res); + } return res; } |