ac9a96da65
sensorservice would deadlock if for some reason a sensor failed to enable. simplifed the code a bit, and made it behave a little closer to mr1.1 -- I couldn't convince myself that some changes in how locks were used were correct. Bug: 9794362 Change-Id: I6110f5dbb67e543f1c71d127de2299232badb36a
68 lines
1.8 KiB
C++
68 lines
1.8 KiB
C++
/*
|
|
* Copyright (C) 2010 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#include <stdint.h>
|
|
#include <sys/types.h>
|
|
|
|
#include <cutils/log.h>
|
|
|
|
#include "SensorInterface.h"
|
|
|
|
namespace android {
|
|
// ---------------------------------------------------------------------------
|
|
|
|
SensorInterface::~SensorInterface()
|
|
{
|
|
}
|
|
|
|
// ---------------------------------------------------------------------------
|
|
|
|
HardwareSensor::HardwareSensor(const sensor_t& sensor)
|
|
: mSensorDevice(SensorDevice::getInstance()),
|
|
mSensor(&sensor)
|
|
{
|
|
ALOGI("%s", sensor.name);
|
|
}
|
|
|
|
HardwareSensor::~HardwareSensor() {
|
|
}
|
|
|
|
bool HardwareSensor::process(sensors_event_t* outEvent,
|
|
const sensors_event_t& event) {
|
|
*outEvent = event;
|
|
return true;
|
|
}
|
|
|
|
status_t HardwareSensor::activate(void* ident, bool enabled) {
|
|
return mSensorDevice.activate(ident, mSensor.getHandle(), enabled);
|
|
}
|
|
|
|
status_t HardwareSensor::setDelay(void* ident, int handle, int64_t ns) {
|
|
return mSensorDevice.setDelay(ident, handle, ns);
|
|
}
|
|
|
|
void HardwareSensor::autoDisable(void *ident, int handle) {
|
|
mSensorDevice.autoDisable(ident, handle);
|
|
}
|
|
|
|
Sensor HardwareSensor::getSensor() const {
|
|
return mSensor;
|
|
}
|
|
|
|
|
|
// ---------------------------------------------------------------------------
|
|
}; // namespace android
|