add macro to control if need sensor lister, now disable it for it is useless for us now

2 files changed, 16 insertions, 7 deletions

diff --git a/CameraHal.cpp b/CameraHal.cpp
index 71856e7..60b7c54 100755
--- a/CameraHal.cpp
+++ b/CameraHal.cpp
@@ -3021,7 +3021,9 @@ CameraHal::CameraHal(int cameraId)
     mPreviewStateOld = 0;
     mRecordingEnabled = 0;
     mRecordEnabled = 0;
+#ifdef ENABLE_SENSOR_LISTENER
     mSensorListener = NULL;
+#endif
     mVideoWidth = 0;
     mVideoHeight = 0;
 
@@ -3197,12 +3199,12 @@ status_t CameraHal::initialize(CameraProperties::Properties* properties)
     ///Initialize default parameters
     initDefaultParameters();
 
-
     if ( setParameters(mParameters) != NO_ERROR )
-        {
-        CAMHAL_LOGEA("Failed to set default parameters?!");
-        }
+    {
+	    CAMHAL_LOGEA("Failed to set default parameters?!");
+    }
 
+#ifdef ENABLE_SENSOR_LISTENER
     // register for sensor events
     mSensorListener = new SensorListener();
     if (mSensorListener.get()) {
@@ -3215,12 +3217,12 @@ status_t CameraHal::initialize(CameraProperties::Properties* properties)
             mSensorListener = NULL;
         }
     }
+#endif
 
     LOG_FUNCTION_NAME_EXIT;
-
     return NO_ERROR;
 
-    fail_loop:
+fail_loop:
 
         ///Free up the resources because we failed somewhere up
         deinitialize();
@@ -3641,11 +3643,13 @@ void CameraHal::deinitialize()
 
     mSetPreviewWindowCalled = false;
 
+#ifdef ENABLE_SENSOR_LISTENER
     if (mSensorListener.get()) {
         mSensorListener->disableSensor(SensorListener::SENSOR_ORIENTATION);
         mSensorListener.clear();
         mSensorListener = NULL;
     }
+#endif
 
     LOG_FUNCTION_NAME_EXIT;
 
diff --git a/inc/CameraHal.h b/inc/CameraHal.h
index 9379ed8..c6bd54a 100755
--- a/inc/CameraHal.h
+++ b/inc/CameraHal.h
@@ -78,6 +78,10 @@
 //TODO this is wrong. fix this:
 #define HAL_PIXEL_FORMAT_NV12 HAL_PIXEL_FORMAT_YCrCb_420_SP
 
+//sensor listener is useless now, camera don't need to knwo the orientation now
+//disable it now
+//#define ENABLE_SENSOR_LISTENER 1 
+
 //Uncomment to enable more verbose/debug logs
 #define DEBUG_LOG
 
@@ -1209,8 +1213,9 @@ private:
 
     mutable Mutex mLock;
 
+#ifdef ENABLE_SENSOR_LISTENER
     sp<SensorListener> mSensorListener;
-
+#endif
     void* mCameraAdapterHandle;
 
     CameraParameters mParameters;