summaryrefslogtreecommitdiffstats
path: root/services/camera
diff options
context:
space:
mode:
authorRicardo Cerqueira <ricardo@cyngn.com>2016-03-16 20:02:38 +0000
committerRicardo Cerqueira <ricardo@cyngn.com>2016-04-11 16:44:19 +0100
commitbaf93ea325ca416aa5a0fc0c6892dda4cef1f444 (patch)
treec469b67ebba198a1dde3d4ca2dec454f9cfe917e /services/camera
parenta4123803d0a0e9e0c69faa4207d357cc74a65d58 (diff)
downloadframeworks_av-baf93ea325ca416aa5a0fc0c6892dda4cef1f444.zip
frameworks_av-baf93ea325ca416aa5a0fc0c6892dda4cef1f444.tar.gz
frameworks_av-baf93ea325ca416aa5a0fc0c6892dda4cef1f444.tar.bz2
CameraClient: MTK Support
Return on MTK hardware, the HAL does this internally and duplicating it here causes an infinite loop. Change-Id: I5bdb925ddb49980747b58dfae4543f812cef4c7d
Diffstat (limited to 'services/camera')
-rw-r--r--services/camera/libcameraservice/api1/CameraClient.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/services/camera/libcameraservice/api1/CameraClient.cpp b/services/camera/libcameraservice/api1/CameraClient.cpp
index 735a4ae..af46d63 100644
--- a/services/camera/libcameraservice/api1/CameraClient.cpp
+++ b/services/camera/libcameraservice/api1/CameraClient.cpp
@@ -695,6 +695,9 @@ void CameraClient::disableMsgType(int32_t msgType) {
#define CHECK_MESSAGE_INTERVAL 10 // 10ms
bool CameraClient::lockIfMessageWanted(int32_t msgType) {
+#ifdef MTK_HARDWARE
+ return true;
+#endif
int sleepCount = 0;
while (mMsgEnabled & msgType) {
if (mLock.tryLock() == NO_ERROR) {