diff options
| author | Nikita Borodikhin <nikita.borodikhin@ti.com> | 2012-09-06 15:40:22 -0700 |
|---|---|---|
| committer | Daniel Levin <dendy@ti.com> | 2012-11-26 19:55:39 +0200 |
| commit | 77f1281d3cfc071243a284111ef0844e7f89c157 (patch) | |
| tree | e0f12a6d91ecdc7050ce2529a7acb91ad13dcccb /camera/SensorListener.cpp | |
| parent | f2cc487c5b7753167d485ce0061751e96518e27c (diff) | |
| download | hardware_ti_omap4-77f1281d3cfc071243a284111ef0844e7f89c157.zip hardware_ti_omap4-77f1281d3cfc071243a284111ef0844e7f89c157.tar.gz hardware_ti_omap4-77f1281d3cfc071243a284111ef0844e7f89c157.tar.bz2 | |
CameraHAL: make orientation sensor optional
Weaken camera strong dependency on orientation sensor which causes it to
crash in case the sensor is absent, e.g. on Panda.
Change-Id: I276c862878e0a99abb52122fa98c50e067f54f22
Signed-off-by: Nikita Borodikhin <nikita.borodikhin@ti.com>
Diffstat (limited to 'camera/SensorListener.cpp')
| -rw-r--r-- | camera/SensorListener.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/camera/SensorListener.cpp b/camera/SensorListener.cpp index 45a278b..e53fa83 100644 --- a/camera/SensorListener.cpp +++ b/camera/SensorListener.cpp @@ -201,10 +201,14 @@ void SensorListener::enableSensor(sensor_type_t type) { if ((type & SENSOR_ORIENTATION) && !(sensorsEnabled & SENSOR_ORIENTATION)) { sensor = mgr.getDefaultSensor(android::Sensor::TYPE_ACCELEROMETER); - CAMHAL_LOGDB("orientation = %p (%s)", sensor, sensor->getName().string()); - mSensorEventQueue->enableSensor(sensor); - mSensorEventQueue->setEventRate(sensor, ms2ns(100)); - sensorsEnabled |= SENSOR_ORIENTATION; + if(sensor) { + CAMHAL_LOGDB("orientation = %p (%s)", sensor, sensor->getName().string()); + mSensorEventQueue->enableSensor(sensor); + mSensorEventQueue->setEventRate(sensor, ms2ns(100)); + sensorsEnabled |= SENSOR_ORIENTATION; + } else { + CAMHAL_LOGDB("not enabling absent orientation sensor"); + } } LOG_FUNCTION_NAME_EXIT; |