commit 7d2a4aaaf5691ee523fc0d03c286620f392ed16f
author Igor Murashkin <iam@google.com> Fri Oct 05 17:09:09 2012 -0700
committer Igor Murashkin <iam@google.com> Fri Oct 05 17:09:09 2012 -0700
tree 16bccba273eed47c50221f6d3269fe46e789fb53
parent 7373cbe85e617345f7002256a4be389fe62af913

Camera2: Report getMaxNumFocusAreas 0 for fixed focus cameras

Bug: 7298805
Change-Id: I7499b80a9416bf454c8ea80c31ea4fdd3c4ee2d7

services/camera/libcameraservice/camera2/Parameters.h

diff --git a/services/camera/libcameraservice/camera2/Parameters.h b/services/camera/libcameraservice/camera2/Parameters.h
index daae7c4..fd02744 100644
--- a/services/camera/libcameraservice/camera2/Parameters.h
+++ b/services/camera/libcameraservice/camera2/Parameters.h
@@ -258,8 +258,15 @@
     static const char* focusModeEnumToString(focusMode_t focusMode);
     static status_t parseAreas(const char *areasCStr,
             Vector<Area> *areas);
-    static status_t validateAreas(const Vector<Area> &areas,
-                                  size_t maxRegions);
+
+    enum AreaKind
+    {
+        AREA_KIND_FOCUS,
+        AREA_KIND_METERING
+    };
+    status_t validateAreas(const Vector<Area> &areas,
+                                  size_t maxRegions,
+                                  AreaKind areaKind) const;
     static bool boolFromString(const char *boolStr);
 
     // Map from camera orientation + facing to gralloc transform enum