From 9c8a091436052fb0f3290356abe1ac55b7bae8a2 Mon Sep 17 00:00:00 2001
From: Eino-Ville Talvala <etalvala@google.com>
Date: Sun, 14 Sep 2014 14:52:19 -0700
Subject: Camera3Device: Treat failure to idle as an error

Bug: 16899526
Change-Id: Ia995aac6360c9c41ed654af5a7052480f23903d8
---
 services/camera/libcameraservice/device3/Camera3Device.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'services/camera/libcameraservice/device3/Camera3Device.cpp')

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;
 }
 
-- 
cgit v1.1