diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2014-09-15 18:11:13 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-15 18:11:14 +0000 |
| commit | dd5f7dc1a870877c2f0cbe0b595c42b77035f9ec (patch) | |
| tree | 82130dab33dc45792f7d1a493abec41fa2999b57 /services/camera/libcameraservice/device3 | |
| parent | 2a6074c4f7dd6f5b85ea8d858199d4970ff404ac (diff) | |
| parent | 9c8a091436052fb0f3290356abe1ac55b7bae8a2 (diff) | |
| download | frameworks_av-dd5f7dc1a870877c2f0cbe0b595c42b77035f9ec.zip frameworks_av-dd5f7dc1a870877c2f0cbe0b595c42b77035f9ec.tar.gz frameworks_av-dd5f7dc1a870877c2f0cbe0b595c42b77035f9ec.tar.bz2 | |
Merge "Camera3Device: Treat failure to idle as an error" into lmp-dev
Diffstat (limited to 'services/camera/libcameraservice/device3')
| -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 690f675..6a7f9e7 100644 --- a/services/camera/libcameraservice/device3/Camera3Device.cpp +++ b/services/camera/libcameraservice/device3/Camera3Device.cpp @@ -1092,6 +1092,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; } |