From: Eino-Ville Talvala <etalvala@google.com>
Date: Sun, 14 Sep 2014 21:52:19 +0000 (-0700)
Subject: Camera3Device: Treat failure to idle as an error
X-Git-Tag: android-x86-6.0-r1~852^2~338^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=9c8a091436052fb0f3290356abe1ac55b7bae8a2;p=android-x86%2Fframeworks-av.git

Camera3Device: Treat failure to idle as an error

Bug: 16899526
Change-Id: Ia995aac6360c9c41ed654af5a7052480f23903d8
---

diff --git a/services/camera/libcameraservice/device3/Camera3Device.cpp b/services/camera/libcameraservice/device3/Camera3Device.cpp
index fafe3497ab..c3e41d303f 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;
 }