Revert "CameraHAL : Multiple focus and exposure areas support"

This reverts commit bd9754a1b2c8d5e0a8788d0e42d018857bfef7a7.

Conflicts:

	camera/inc/OMXCameraAdapter/OMXCameraAdapter.h

Change-Id: Iad51c457b05de9b5492061b8402e508a6c5b42bf

1 files changed, 6 insertions, 6 deletions

diff --git a/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h b/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h
index 4f53b7d..8e3a295 100644
--- a/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h
+++ b/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h
@@ -474,7 +474,6 @@ private:
     status_t setExposureLock(Gen3A_settings& Gen3A);
     status_t setWhiteBalanceLock(Gen3A_settings& Gen3A);
     status_t set3ALock(OMX_BOOL toggle);
-    status_t setMeteringAreas(Gen3A_settings& Gen3A);
 
     //API to set FrameRate using VFR interface
     status_t setVFramerate(OMX_U32 minFrameRate,OMX_U32 maxFrameRate);
@@ -497,7 +496,12 @@ private:
     status_t printComponentVersion(OMX_HANDLETYPE handle);
 
     //Touch AF
-    status_t setTouchFocus();
+    status_t setTouchFocus(size_t posX,
+                           size_t posY,
+                           size_t posWidth,
+                           size_t posHeight,
+                           size_t previewWidth,
+                           size_t previewHeight);
 
     //Face detection
     status_t setParametersFD(const CameraParameters &params,
@@ -553,7 +557,6 @@ private:
     static status_t insertSenMount(CameraProperties::Properties*, OMX_TI_CAPTYPE&);
     static status_t insertDefaults(CameraProperties::Properties*, OMX_TI_CAPTYPE&);
     static status_t insertLocks(CameraProperties::Properties*, OMX_TI_CAPTYPE&);
-    static status_t insertAreas(CameraProperties::Properties*, OMX_TI_CAPTYPE&);
 
     status_t setParametersCapture(const CameraParameters &params,
                                   BaseCameraAdapter::AdapterState state);
@@ -727,9 +730,6 @@ private:
     Vector< sp<CameraArea> > mFocusAreas;
     mutable Mutex mFocusAreasLock;
 
-    // Current Metering areas
-    Vector< sp<CameraArea> > mMeteringAreas;
-
     CaptureMode mCapMode;
     size_t mBurstFrames;
     size_t mCapturedFrames;