summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEino-Ville Talvala <etalvala@google.com>2013-06-17 16:29:19 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-06-17 16:29:19 -0700
commit078a540525f86517aefa4afc56e12fbd74e3823d (patch)
treee88a3af597f0d48b355ff01ec970921445e23346
parent0063bbff7db6096a877deaaf48787ca78a3a37c8 (diff)
parentbda5d1f2a34f9b7ded0bc0441be4856e78ec066c (diff)
downloadframeworks_av-078a540525f86517aefa4afc56e12fbd74e3823d.zip
frameworks_av-078a540525f86517aefa4afc56e12fbd74e3823d.tar.gz
frameworks_av-078a540525f86517aefa4afc56e12fbd74e3823d.tar.bz2
am bda5d1f2: am 241b5279: Camera3: Power: Properly shut down unused thread.
* commit 'bda5d1f2a34f9b7ded0bc0441be4856e78ec066c': Camera3: Power: Properly shut down unused thread.
-rw-r--r--services/camera/libcameraservice/camera2/ZslProcessor3.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/services/camera/libcameraservice/camera2/ZslProcessor3.cpp b/services/camera/libcameraservice/camera2/ZslProcessor3.cpp
index 2e06691..40c77df 100644
--- a/services/camera/libcameraservice/camera2/ZslProcessor3.cpp
+++ b/services/camera/libcameraservice/camera2/ZslProcessor3.cpp
@@ -329,8 +329,9 @@ void ZslProcessor3::dump(int fd, const Vector<String16>& /*args*/) const {
}
bool ZslProcessor3::threadLoop() {
- // TODO: remove dependency on thread
- return true;
+ // TODO: remove dependency on thread. For now, shut thread down right
+ // away.
+ return false;
}
void ZslProcessor3::dumpZslQueue(int fd) const {