commit a4ae90a498f01eb541b8b1b332c546f824696d5d
author android-build-team Robot <android-build-team-robot@google.com> Wed Oct 18 07:25:11 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Wed Oct 18 07:25:11 2017 +0000
tree e9b22a800adac878aa4d9b60311c9ee66fa23c14
parent 63bb0ba479726b9f41c30416b4747a2ecff21c8d
parent c1ebd50044a5f4590842d4dfc96d3e31305adad2

Snap for 4402249 from c1ebd50044a5f4590842d4dfc96d3e31305adad2 to oc-mr1-release

Change-Id: Iccdfbf3b154aa931a9d684f9595a724938b4ead3

msm8998/QCamera2/HAL3/QCamera3HWI.cpp

diff --git a/msm8998/QCamera2/HAL3/QCamera3HWI.cpp b/msm8998/QCamera2/HAL3/QCamera3HWI.cpp
index 124405d..fe1fe8d 100644
--- a/msm8998/QCamera2/HAL3/QCamera3HWI.cpp
+++ b/msm8998/QCamera2/HAL3/QCamera3HWI.cpp
@@ -6207,13 +6207,16 @@
     {
         // Configure Easel for stream on.
         std::unique_lock<std::mutex> l(gHdrPlusClientLock);
-
-        // Now that sensor mode should have been selected, get the selected sensor mode
-        // info.
-        memset(&mSensorModeInfo, 0, sizeof(mSensorModeInfo));
-        getCurrentSensorModeInfo(mSensorModeInfo);
-
         if (EaselManagerClientOpened) {
+            // Now that sensor mode should have been selected, get the selected sensor mode
+            // info.
+            memset(&mSensorModeInfo, 0, sizeof(mSensorModeInfo));
+            rc = getCurrentSensorModeInfo(mSensorModeInfo);
+            if (rc != NO_ERROR) {
+                ALOGE("%s: Get current sensor mode failed, bail out: %s (%d).", __FUNCTION__,
+                        strerror(-rc), rc);
+                return rc;
+            }
             logEaselEvent("EASEL_STARTUP_LATENCY", "Starting MIPI");
             rc = gEaselManagerClient->startMipi(mCameraId, mSensorModeInfo.op_pixel_clk,
                     /*enableCapture*/true);