diff options
| -rw-r--r-- | media/libstagefright/wifi-display/source/WifiDisplaySource.cpp | 5 | ||||
| -rw-r--r-- | services/camera/libcameraservice/Camera2Client.cpp | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/media/libstagefright/wifi-display/source/WifiDisplaySource.cpp b/media/libstagefright/wifi-display/source/WifiDisplaySource.cpp index b16c5d0..29e9e3d 100644 --- a/media/libstagefright/wifi-display/source/WifiDisplaySource.cpp +++ b/media/libstagefright/wifi-display/source/WifiDisplaySource.cpp @@ -745,7 +745,10 @@ status_t WifiDisplaySource::onReceiveM3Response( } mUsingHDCP = false; - if (!params->findParameter("wfd_content_protection", &value)) { + if (property_get("persist.sys.wfd.nohdcp", val, NULL) + && !strcmp("1", val)) { + ALOGI("Content protection has been disabled for WFD sinks"); + } else if (!params->findParameter("wfd_content_protection", &value)) { ALOGI("Sink doesn't appear to support content protection."); } else if (value == "none") { ALOGI("Sink does not support content protection."); 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); |