summaryrefslogtreecommitdiffstats
path: root/services/camera
diff options
context:
space:
mode:
authorRicardo Cerqueira <cyanogenmod@cerqueira.org>2012-12-20 00:48:37 +0000
committerRicardo Cerqueira <cyanogenmod@cerqueira.org>2012-12-20 00:48:37 +0000
commit90d6cf79ae229671d3ef735a94d6e215e1a37c5e (patch)
tree265c9c97ecb0285992566b2e8353a6b250523283 /services/camera
parentb83e8c40add750ff99afda98c9df0a2baf93b99e (diff)
downloadframeworks_av-90d6cf79ae229671d3ef735a94d6e215e1a37c5e.zip
frameworks_av-90d6cf79ae229671d3ef735a94d6e215e1a37c5e.tar.gz
frameworks_av-90d6cf79ae229671d3ef735a94d6e215e1a37c5e.tar.bz2
WifiDisplay: Add an HDCP toggle
Some WFD dongles have frequent (or permanent) failures while negotiating HDCP with the device, so add a toggle to allow skipping HDCP entirely Change-Id: I999158df84d4a7489c40ecdf07ebcf107d071d40
Diffstat (limited to 'services/camera')
-rw-r--r--services/camera/libcameraservice/Camera2Client.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/services/camera/libcameraservice/Camera2Client.cpp b/services/camera/libcameraservice/Camera2Client.cpp
index e59a240..d45881d 100644
--- a/services/camera/libcameraservice/Camera2Client.cpp
+++ b/services/camera/libcameraservice/Camera2Client.cpp
@@ -1430,11 +1430,13 @@ void Camera2Client::notifyAutoFocus(uint8_t newState, int triggerId) {
}
}
if (sendMovingMessage) {
+#ifndef OMAP_ICS_CAMERA
SharedCameraClient::Lock l(mSharedCameraClient);
if (l.mCameraClient != 0) {
l.mCameraClient->notifyCallback(CAMERA_MSG_FOCUS_MOVE,
afInMotion ? 1 : 0, 0);
}
+#endif
}
if (sendCompletedMessage) {
SharedCameraClient::Lock l(mSharedCameraClient);