Merge "Allow camera to be disabled via Device Policy Manager"

        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();