commit e62ccda6c138e11649500b0125c6bd1e78488729
author Shuzhen Wang <shuzhenwang@google.com> Thu May 24 19:10:32 2018 +0000
committer Shuzhen Wang <shuzhenwang@google.com> Thu May 24 19:10:56 2018 +0000
tree d6ebfe02ce36c394810fad802e80feb23148326c
parent b139b178e8aca1343587dc8657360a21a1df8a10

Revert "Camera: Load initial session params speculatively"

This reverts commit b139b178e8aca1343587dc8657360a21a1df8a10.

Reason for revert: This breaks camera-camcorder switch on older devices

Bug: 80227606
Change-Id: Idd63652946537abdebed61ea4acf18b79d513048

services/camera/libcameraservice/device3/Camera3Device.cpp

diff --git a/services/camera/libcameraservice/device3/Camera3Device.cpp b/services/camera/libcameraservice/device3/Camera3Device.cpp
index d9bcba3..9acbf0a 100644
--- a/services/camera/libcameraservice/device3/Camera3Device.cpp
+++ b/services/camera/libcameraservice/device3/Camera3Device.cpp
@@ -77,8 +77,7 @@
         mNextShutterFrameNumber(0),
         mNextReprocessShutterFrameNumber(0),
         mListener(NULL),
-        mVendorTagId(CAMERA_METADATA_INVALID_VENDOR_ID),
-        mLastTemplateId(-1)
+        mVendorTagId(CAMERA_METADATA_INVALID_VENDOR_ID)
 {
     ATRACE_CALL();
     camera3_callback_ops::notify = &sNotify;
@@ -1598,18 +1597,6 @@
     Mutex::Autolock il(mInterfaceLock);
     Mutex::Autolock l(mLock);
 
-    // In case the client doesn't include any session parameter, try a
-    // speculative configuration using the values from the last cached
-    // default request.
-    if (sessionParams.isEmpty() &&
-            ((mLastTemplateId > 0) && (mLastTemplateId < CAMERA3_TEMPLATE_COUNT)) &&
-            (!mRequestTemplateCache[mLastTemplateId].isEmpty())) {
-        ALOGV("%s: Speculative session param configuration with template id: %d", __func__,
-                mLastTemplateId);
-        return filterParamsAndConfigureLocked(mRequestTemplateCache[mLastTemplateId],
-                operatingMode);
-    }
-
     return filterParamsAndConfigureLocked(sessionParams, operatingMode);
 }
 
@@ -1686,7 +1673,6 @@
 
         if (!mRequestTemplateCache[templateId].isEmpty()) {
             *request = mRequestTemplateCache[templateId];
-            mLastTemplateId = templateId;
             return OK;
         }
     }
@@ -1711,7 +1697,6 @@
         mRequestTemplateCache[templateId].acquire(rawRequest);
 
         *request = mRequestTemplateCache[templateId];
-        mLastTemplateId = templateId;
     }
     return OK;
 }