commit b131f4a7c8bcce698a4299434ffd9460dc30e9cf
author Shuzhen Wang <shuzhenwang@google.com> Thu Jun 21 18:19:11 2018 -0700
committer Shuzhen Wang <shuzhenwang@google.com> Wed Jun 27 11:46:04 2018 -0700
tree 81ada29788adf2bfa2eecabe1db06dc765c35583
parent 53eea85dcbdd3377c4c34e5f5b0eba8dbf6b5b29

Camera: Use default focal length in template to derive FOV

This is consistent with the default focal length set by the API1-HAL3
shim.

Test: Camera CTS, FOV test for CtsVerifier
Bug: 110445633
Change-Id: I4ecfb32c7cecdd9c56e04b25cf4d92a86122b2cb

services/camera/libcameraservice/api1/Camera2Client.cpp

diff --git a/services/camera/libcameraservice/api1/Camera2Client.cpp b/services/camera/libcameraservice/api1/Camera2Client.cpp
index 0b2d1b0..d59b313 100644
--- a/services/camera/libcameraservice/api1/Camera2Client.cpp
+++ b/services/camera/libcameraservice/api1/Camera2Client.cpp
@@ -102,7 +102,7 @@
     {
         SharedParameters::Lock l(mParameters);
 
-        res = l.mParameters.initialize(&(mDevice->info()), mDeviceVersion);
+        res = l.mParameters.initialize(mDevice.get(), mDeviceVersion);
         if (res != OK) {
             ALOGE("%s: Camera %d: unable to build defaults: %s (%d)",
                     __FUNCTION__, mCameraId, strerror(-res), res);