release-request-f7e8a600-b041-4cd7-94a0-d043d188195c-for-git_pi-release-4318525 snap-temp-L60300000099762192

Change-Id: Ia7269795ff49e9baf36303d171b84308be130fcb

2 files changed, 6 insertions, 3 deletions

diff --git a/camera/include/HdrPlusTypes.h b/camera/include/HdrPlusTypes.h
index 54cf8c7..407d67b 100644
--- a/camera/include/HdrPlusTypes.h
+++ b/camera/include/HdrPlusTypes.h
@@ -414,12 +414,14 @@ struct FrameMetadata {
 struct RequestMetadata {
     std::array<int32_t, 4> cropRegion; // android.scaler.cropRegion (x_min, y_min, width, height)
     bool postviewEnable; // com.google.nexus.experimental2017.stats.postview_enable
+    bool continuousCapturing; // Whether to capture RAW while HDR+ processing.
 
     // Check if the contents of lhs and rhs are equal. For vector and array variables, two are
     // equal if their elements are equal at the same position.
     bool operator==(const RequestMetadata& rhs) const {
         return cropRegion == rhs.cropRegion &&
-               postviewEnable == rhs.postviewEnable;
+               postviewEnable == rhs.postviewEnable &&
+               continuousCapturing == rhs.continuousCapturing;
     }
 
     // Convert this static metadata to a string and append it to the specified string.
@@ -427,6 +429,7 @@ struct RequestMetadata {
         if (strOut == nullptr) return;
         metadatautils::appendVectorOrArrayToString(strOut, "cropRegion", cropRegion);
         metadatautils::appendValueToString(strOut, "postviewEnable", postviewEnable);
+        metadatautils::appendValueToString(strOut, "continuousCapturing", continuousCapturing);
     }
 };
 
diff --git a/camera/libhdrplusclient/include/EaselManagerClient.h b/camera/libhdrplusclient/include/EaselManagerClient.h
index 0212a46..682cb67 100644
--- a/camera/libhdrplusclient/include/EaselManagerClient.h
+++ b/camera/libhdrplusclient/include/EaselManagerClient.h
@@ -21,7 +21,7 @@
 #include <utils/Errors.h>
 #include <utils/Mutex.h>
 
-#define FW_VER_SIZE 16
+#define FW_VER_SIZE 24
 
 namespace android {
 
@@ -71,7 +71,7 @@ public:
      *
      * Firmware version string is added to image exif
      */
-    virtual status_t getFwVersion(char fwVersion[FW_VER_SIZE]) = 0;
+    virtual status_t getFwVersion(char *fwVersion) = 0;
 
     /*
      * Start MIPI with an output pixel lock rate for a camera.