Skip to content

Commit 869068c

Browse files
committed
onyx: QCamera2: Move decleration of Camera Parameters
* These parameters are required for camera to work in nougat. * Since our camera HAL is OSS this can be moved into the HAL instead of an extra header. * KEY_APP_MASK[] isn't required anymore. Change-Id: I2ff9de7c6cc7b3725c7ee04f63375c2e58fbd28a
1 parent 8ffe59c commit 869068c

File tree

3 files changed

+8
-25
lines changed

3 files changed

+8
-25
lines changed

camera/QCamera2/HAL/QCameraParameters.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -336,6 +336,10 @@ const char QCameraParameters::CDS_MODE_AUTO[] = "auto";
336336

337337
const char QCameraParameters::KEY_SELECTED_AUTO_SCENE[] = "selected-auto-scene";
338338

339+
// Values missing in nougat
340+
const char QCameraParameters::FOCUS_MODE_MANUAL_POSITION[] = "manual";
341+
const char QCameraParameters::WHITE_BALANCE_MANUAL_CCT[] = "manual-cct";
342+
339343
static const char* portrait = "portrait";
340344
static const char* landscape = "landscape";
341345

camera/QCamera2/HAL/QCameraParameters.h

+4
Original file line numberDiff line numberDiff line change
@@ -480,6 +480,10 @@ class QCameraParameters: public CameraParameters
480480
static const char FLIP_MODE_H[];
481481
static const char FLIP_MODE_VH[];
482482

483+
// Values missing in nougat
484+
static const char FOCUS_MODE_MANUAL_POSITION[];
485+
static const char WHITE_BALANCE_MANUAL_CCT[];
486+
483487
//Values for CDS Mode
484488
static const char CDS_MODE_OFF[];
485489
static const char CDS_MODE_ON[];

include/camera/CameraParametersExtra.h

-25
This file was deleted.

0 commit comments

Comments
 (0)