commit e5df375a02a25fbcc9f06b789a5645255e89de6e
author Ranjith Kagathi Ananda <ranjithkagathi@google.com> Fri Apr 28 11:22:51 2017 -0700
committer Ranjith Kagathi Ananda <ranjithkagathi@google.com> Fri Apr 28 11:33:37 2017 -0700
tree f62e377ba0ef5cc82a4f49aaaa5d5f89d8717cc4
parent f1b4ddc92f1a955072c7d02b06cd2afb91f1bfa9

QCamera2/HAL3: Add offset to Tango vendor tag

Tango vendor tag values are used by NDK clients.
Add offset to Tango vendor tag so that the value
does not get affected when new vendor tags are
inserted before Tango vendor tag section

Test: Tested basic sanity and CTS

BUG=36070819

Change-Id: Ib7d946dd99ea5c127ee634d87b755c98a412785f

msm8998/QCamera2/HAL3/QCamera3HWI.cpp

diff --git a/msm8998/QCamera2/HAL3/QCamera3HWI.cpp b/msm8998/QCamera2/HAL3/QCamera3HWI.cpp
index d6ef9fa..1b18c54 100644
--- a/msm8998/QCamera2/HAL3/QCamera3HWI.cpp
+++ b/msm8998/QCamera2/HAL3/QCamera3HWI.cpp
@@ -4942,9 +4942,9 @@
             }
         }
 
-        if (meta.exists(NEXUS_EXPERIMENTAL_2017_SENSOR_MODE_FULLFOV)) {
+        if (meta.exists(TANGO_MODE_DATA_SENSOR_FULLFOV)) {
             uint8_t sensorModeFullFov =
-                    meta.find(NEXUS_EXPERIMENTAL_2017_SENSOR_MODE_FULLFOV).data.u8[0];
+                    meta.find(TANGO_MODE_DATA_SENSOR_FULLFOV).data.u8[0];
             LOGD("SENSOR_MODE_FULLFOV %d" , sensorModeFullFov);
             if (ADD_SET_PARAM_ENTRY_TO_BATCH(mParameters, CAM_INTF_META_SENSOR_MODE_FULLFOV,
                     sensorModeFullFov)) {
@@ -9959,7 +9959,7 @@
        /* DevCamDebug metadata end */
        NEXUS_EXPERIMENTAL_2017_HISTOGRAM_ENABLE,
        NEXUS_EXPERIMENTAL_2017_HISTOGRAM_BINS,
-       NEXUS_EXPERIMENTAL_2017_SENSOR_MODE_FULLFOV,
+       TANGO_MODE_DATA_SENSOR_FULLFOV,
        NEXUS_EXPERIMENTAL_2017_TRACKING_AF_TRIGGER,
        };