Camera: set default focus and metering areas to null.

Earlier, default values were not null which
is not compatiable with our HAL.

(cherry picked from commit d45720bbf03b699f9afd5909fedd82ee5a2e9745 )

Change-Id: Icfbd06ecfbf55acd1502a7d395a9239c9c9c2b1a

Conflicts:
	src/com/android/camera/FocusOverlayManager.java
(cherry picked from commit 98b3c247b8bd03b16d3b6f4b147425cad31684f7)
(cherry picked from commit d3c5da81208bd01265950b31ef670bf153d0bdf8)

1 files changed, 4 insertions, 7 deletions

diff --git a/src/com/android/camera/FocusOverlayManager.java b/src/com/android/camera/FocusOverlayManager.java
index adfd9652d..d7b61043d 100644
--- a/src/com/android/camera/FocusOverlayManager.java
+++ b/src/com/android/camera/FocusOverlayManager.java
@@ -507,13 +507,10 @@ public class FocusOverlayManager {
         // Put focus indicator to the center. clear reset position
         mUI.clearFocus();
         // Initialize mFocusArea.
-        if (mFocusAreaSupported) {
-            initializeFocusAreas(mPreviewWidth / 2, mPreviewHeight / 2);
-        }
-        // Reset metering area when no specific region is selected.
-        if (mMeteringAreaSupported) {
-            resetMeteringAreas();
-        }
+        mFocusArea = null;
+        // Initialize mMeteringArea.
+        mMeteringArea = null;
+
         mFocusDefault = true;
     }