From 04c453dccad920b9556b6e9000617a06d04d724e Mon Sep 17 00:00:00 2001 From: Wu-cheng Li Date: Fri, 20 May 2011 14:54:25 +0800 Subject: Allow camera to be disabled via Device Policy Manager bug:4185309 Change-Id: I8be89d892b8f540fd05913c93f97b92346a0a282 --- services/camera/libcameraservice/CameraService.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'services/camera') diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp index 1e8c30b..a011ae2 100644 --- a/services/camera/libcameraservice/CameraService.cpp +++ b/services/camera/libcameraservice/CameraService.cpp @@ -147,6 +147,14 @@ sp CameraService::connect( return NULL; } + char value[PROPERTY_VALUE_MAX]; + property_get("sys.secpolicy.camera.disabled", value, "0"); + if (strcmp(value, "1") == 0) { + // Camera is disabled by DevicePolicyManager. + LOGI("Camera is disabled. connect X (pid %d) rejected", callingPid); + return NULL; + } + Mutex::Autolock lock(mServiceLock); if (mClient[cameraId] != 0) { client = mClient[cameraId].promote(); -- cgit v1.1