MiPad4/android_device_xiaomi_clover
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: MiPad4:fourteen/votlage
Branches Tags
MiPad4:fourteen/votlage
MiPad4:14
..
compare: MiPad4:14
Branches Tags
MiPad4:fourteen/votlage
MiPad4:14

No commits in common. "fourteen/votlage" and "14" have entirely different histories.
fourteen/v ... 14

15 changed files with 76 additions and 80 deletions
Show stats Expand all files Collapse all files

7
AndroidProducts.mk
View file

@ -23,4 +23,9 @@
# inherit MI PAD 4 ArrowOS device config
PRODUCT_MAKEFILES := \
$(LOCAL_DIR)/voltage_clover.mk
$(LOCAL_DIR)/lineage_clover.mk
COMMON_LUNCH_CHOICES := \
lineage_clover-eng \
lineage_clover-userdebug \
lineage_clover-user

10
camera/QCamera2/HAL/CameraParameters.cpp
View file

@ -204,7 +204,7 @@ String8 CameraParameters::flatten() const
void CameraParameters::unflatten(const String8 &params)
{
const char *a = params.c_str();
const char *a = params.string();
const char *b;
mMap.clear();
@ -270,7 +270,7 @@ const char *CameraParameters::get(const char *key) const
String8 v = mMap.valueFor(String8(key));
if (v.length() == 0)
return 0;
return v.c_str();
return v.string();
}
int CameraParameters::getInt(const char *key) const
@ -462,7 +462,7 @@ void CameraParameters::dump() const
String8 k, v;
k = mMap.keyAt(i);
v = mMap.valueAt(i);
ALOGD("%s: %s\n", k.c_str(), v.c_str());
ALOGD("%s: %s\n", k.string(), v.string());
}
}
@ -477,10 +477,10 @@ status_t CameraParameters::dump(int fd, const Vector<String16>& /*args*/) const
String8 k, v;
k = mMap.keyAt(i);
v = mMap.valueAt(i);
snprintf(buffer, 255, "\t%s: %s\n", k.c_str(), v.c_str());
snprintf(buffer, 255, "\t%s: %s\n", k.string(), v.string());
result.append(buffer);
}
write(fd, result.c_str(), result.size());
write(fd, result.string(), result.size());
return NO_ERROR;
}

20
camera/QCamera2/HAL/QCamera2HWI.cpp
View file

@ -4827,11 +4827,11 @@ int32_t QCamera2HardwareInterface::configureHDRBracketing()
tmp.append(",");
}
if( !tmp.empty() &&
if( !tmp.isEmpty() &&
( MAX_EXP_BRACKETING_LENGTH > tmp.length() ) ) {
//Trim last comma
memset(aeBracket.values, '\0', MAX_EXP_BRACKETING_LENGTH);
memcpy(aeBracket.values, tmp.c_str(), tmp.length() - 1);
memcpy(aeBracket.values, tmp.string(), tmp.length() - 1);
}
LOGH("HDR config values %s",
@ -6625,8 +6625,8 @@ int QCamera2HardwareInterface::dump(int fd)
dprintf(fd, "\n Camera HAL information Begin \n");
dprintf(fd, "Camera ID: %d \n", mCameraId);
dprintf(fd, "StoreMetaDataInFrame: %d \n", mStoreMetaDataInFrame);
dprintf(fd, "\n Configuration: %s", mParameters.dump().c_str());
dprintf(fd, "\n State Information: %s", m_stateMachine.dump().c_str());
dprintf(fd, "\n Configuration: %s", mParameters.dump().string());
dprintf(fd, "\n State Information: %s", m_stateMachine.dump().string());
dprintf(fd, "\n Camera HAL information End \n");
/* send UPDATE_DEBUG_LEVEL to the backend so that they can read the
@ -10552,17 +10552,17 @@ QCameraExif *QCamera2HardwareInterface::getExifData()
rc = mParameters.getExifDateTime(dateTime, subSecTime);
if(rc == NO_ERROR) {
exif->addEntry(EXIFTAGID_DATE_TIME, EXIF_ASCII,
(uint32_t)(dateTime.length() + 1), (void *)dateTime.c_str());
(uint32_t)(dateTime.length() + 1), (void *)dateTime.string());
exif->addEntry(EXIFTAGID_EXIF_DATE_TIME_ORIGINAL, EXIF_ASCII,
(uint32_t)(dateTime.length() + 1), (void *)dateTime.c_str());
(uint32_t)(dateTime.length() + 1), (void *)dateTime.string());
exif->addEntry(EXIFTAGID_EXIF_DATE_TIME_DIGITIZED, EXIF_ASCII,
(uint32_t)(dateTime.length() + 1), (void *)dateTime.c_str());
(uint32_t)(dateTime.length() + 1), (void *)dateTime.string());
exif->addEntry(EXIFTAGID_SUBSEC_TIME, EXIF_ASCII,
(uint32_t)(subSecTime.length() + 1), (void *)subSecTime.c_str());
(uint32_t)(subSecTime.length() + 1), (void *)subSecTime.string());
exif->addEntry(EXIFTAGID_SUBSEC_TIME_ORIGINAL, EXIF_ASCII,
(uint32_t)(subSecTime.length() + 1), (void *)subSecTime.c_str());
(uint32_t)(subSecTime.length() + 1), (void *)subSecTime.string());
exif->addEntry(EXIFTAGID_SUBSEC_TIME_DIGITIZED, EXIF_ASCII,
(uint32_t)(subSecTime.length() + 1), (void *)subSecTime.c_str());
(uint32_t)(subSecTime.length() + 1), (void *)subSecTime.string());
} else {
LOGW("getExifDateTime failed");
}

6
camera/QCamera2/HAL/QCamera2HWICallbacks.cpp
View file

@ -2999,7 +2999,7 @@ void QCamera2HardwareInterface::dumpMetadataToFile(QCameraStream *stream,
String8 filePath(timeBuf);
snprintf(buf, sizeof(buf), "%um_%s_%d.bin", dumpFrmCnt, type, frame->frame_idx);
filePath.append(buf);
int file_fd = open(filePath.c_str(), O_RDWR | O_CREAT, 0777);
int file_fd = open(filePath.string(), O_RDWR | O_CREAT, 0777);
if (file_fd >= 0) {
ssize_t written_len = 0;
metadata->tuning_params.tuning_data_version = TUNING_DATA_VERSION;
@ -3213,7 +3213,7 @@ void QCamera2HardwareInterface::dumpFrameToFile(QCameraStream *stream,
}
filePath.append(buf);
int file_fd = open(filePath.c_str(), O_RDWR | O_CREAT, 0777);
int file_fd = open(filePath.string(), O_RDWR | O_CREAT, 0777);
ssize_t written_len = 0;
if (file_fd >= 0) {
void *data = NULL;
@ -3249,7 +3249,7 @@ void QCamera2HardwareInterface::dumpFrameToFile(QCameraStream *stream,
LOGE("fail to open file for image dumping");
}
if (true == m_bIntRawEvtPending) {
strlcpy(m_BackendFileName, filePath.c_str(), QCAMERA_MAX_FILEPATH_LENGTH);
strlcpy(m_BackendFileName, filePath.string(), QCAMERA_MAX_FILEPATH_LENGTH);
mBackendFileSize = (size_t)written_len;
} else {
dumpFrmCnt++;

68
camera/QCamera2/HAL/QCameraParameters.cpp
View file

@ -5926,8 +5926,8 @@ int32_t QCameraParameters::initDefaultParameters()
m_pCapability->preview_sizes_tbl_cnt <= MAX_SIZES_CNT) {
String8 previewSizeValues = createSizesString(
m_pCapability->preview_sizes_tbl, m_pCapability->preview_sizes_tbl_cnt);
set(KEY_SUPPORTED_PREVIEW_SIZES, previewSizeValues.c_str());
LOGH("supported preview sizes: %s", previewSizeValues.c_str());
set(KEY_SUPPORTED_PREVIEW_SIZES, previewSizeValues.string());
LOGH("supported preview sizes: %s", previewSizeValues.string());
// Set default preview size
CameraParameters::setPreviewSize(m_pCapability->preview_sizes_tbl[0].width,
m_pCapability->preview_sizes_tbl[0].height);
@ -5940,15 +5940,15 @@ int32_t QCameraParameters::initDefaultParameters()
m_pCapability->video_sizes_tbl_cnt <= MAX_SIZES_CNT) {
String8 videoSizeValues = createSizesString(
m_pCapability->video_sizes_tbl, m_pCapability->video_sizes_tbl_cnt);
set(KEY_SUPPORTED_VIDEO_SIZES, videoSizeValues.c_str());
LOGH("supported video sizes: %s", videoSizeValues.c_str());
set(KEY_SUPPORTED_VIDEO_SIZES, videoSizeValues.string());
LOGH("supported video sizes: %s", videoSizeValues.string());
// Set default video size
CameraParameters::setVideoSize(m_pCapability->video_sizes_tbl[0].width,
m_pCapability->video_sizes_tbl[0].height);
//Set preferred Preview size for video
String8 vSize = createSizesString(&m_pCapability->preview_sizes_tbl[0], 1);
set(KEY_PREFERRED_PREVIEW_SIZE_FOR_VIDEO, vSize.c_str());
set(KEY_PREFERRED_PREVIEW_SIZE_FOR_VIDEO, vSize.string());
} else {
LOGW("supported video sizes cnt is 0 or exceeds max!!!");
}
@ -5958,8 +5958,8 @@ int32_t QCameraParameters::initDefaultParameters()
m_pCapability->picture_sizes_tbl_cnt <= MAX_SIZES_CNT) {
String8 pictureSizeValues = createSizesString(
m_pCapability->picture_sizes_tbl, m_pCapability->picture_sizes_tbl_cnt);
set(KEY_SUPPORTED_PICTURE_SIZES, pictureSizeValues.c_str());
LOGH("supported pic sizes: %s", pictureSizeValues.c_str());
set(KEY_SUPPORTED_PICTURE_SIZES, pictureSizeValues.string());
LOGH("supported pic sizes: %s", pictureSizeValues.string());
// Set default picture size to the smallest resolution
CameraParameters::setPictureSize(
m_pCapability->picture_sizes_tbl[m_pCapability->picture_sizes_tbl_cnt-1].width,
@ -5980,8 +5980,8 @@ int32_t QCameraParameters::initDefaultParameters()
cam_dimension_t *totalSizeTbl = m_reprocScaleParam.getTotalSizeTbl();
size_t totalSizeCnt = m_reprocScaleParam.getTotalSizeTblCnt();
String8 pictureSizeValues = createSizesString(totalSizeTbl, totalSizeCnt);
set(KEY_SUPPORTED_PICTURE_SIZES, pictureSizeValues.c_str());
LOGH("scaled supported pic sizes: %s", pictureSizeValues.c_str());
set(KEY_SUPPORTED_PICTURE_SIZES, pictureSizeValues.string());
LOGH("scaled supported pic sizes: %s", pictureSizeValues.string());
}else{
m_reprocScaleParam.setScaleEnable(false);
LOGW("reset scaled picture size table failed.");
@ -5994,7 +5994,7 @@ int32_t QCameraParameters::initDefaultParameters()
String8 thumbnailSizeValues = createSizesString(
THUMBNAIL_SIZES_MAP,
PARAM_MAP_SIZE(THUMBNAIL_SIZES_MAP));
set(KEY_SUPPORTED_JPEG_THUMBNAIL_SIZES, thumbnailSizeValues.c_str());
set(KEY_SUPPORTED_JPEG_THUMBNAIL_SIZES, thumbnailSizeValues.string());
// Set default thumnail size
set(KEY_JPEG_THUMBNAIL_WIDTH, THUMBNAIL_SIZES_MAP[0].width);
set(KEY_JPEG_THUMBNAIL_HEIGHT, THUMBNAIL_SIZES_MAP[0].height);
@ -6005,8 +6005,8 @@ int32_t QCameraParameters::initDefaultParameters()
String8 liveSnpashotSizeValues = createSizesString(
m_pCapability->livesnapshot_sizes_tbl,
m_pCapability->livesnapshot_sizes_tbl_cnt);
set(KEY_QC_SUPPORTED_LIVESNAPSHOT_SIZES, liveSnpashotSizeValues.c_str());
LOGD("supported live snapshot sizes: %s", liveSnpashotSizeValues.c_str());
set(KEY_QC_SUPPORTED_LIVESNAPSHOT_SIZES, liveSnpashotSizeValues.string());
LOGD("supported live snapshot sizes: %s", liveSnpashotSizeValues.string());
m_LiveSnapshotSize =
m_pCapability->livesnapshot_sizes_tbl[m_pCapability->livesnapshot_sizes_tbl_cnt-1];
}
@ -6017,7 +6017,7 @@ int32_t QCameraParameters::initDefaultParameters()
m_pCapability->supported_preview_fmt_cnt,
PREVIEW_FORMATS_MAP,
PARAM_MAP_SIZE(PREVIEW_FORMATS_MAP));
set(KEY_SUPPORTED_PREVIEW_FORMATS, previewFormatValues.c_str());
set(KEY_SUPPORTED_PREVIEW_FORMATS, previewFormatValues.string());
// Set default preview format
CameraParameters::setPreviewFormat(PIXEL_FORMAT_YUV420SP);
@ -6032,12 +6032,12 @@ int32_t QCameraParameters::initDefaultParameters()
m_pCapability->supported_raw_fmt_cnt,
PICTURE_TYPES_MAP,
PARAM_MAP_SIZE(PICTURE_TYPES_MAP));
if (str.c_str() != NULL) {
if (str.string() != NULL) {
pictureTypeValues.append(",");
pictureTypeValues.append(str);
}
set(KEY_SUPPORTED_PICTURE_FORMATS, pictureTypeValues.c_str());
set(KEY_SUPPORTED_PICTURE_FORMATS, pictureTypeValues.string());
// Set default picture Format
CameraParameters::setPictureFormat(PIXEL_FORMAT_JPEG);
// Set raw image size
@ -6059,7 +6059,7 @@ int32_t QCameraParameters::initDefaultParameters()
String8 fpsRangeValues = createFpsRangeString(m_pCapability->fps_ranges_tbl,
m_pCapability->fps_ranges_tbl_cnt,
default_fps_index);
set(KEY_SUPPORTED_PREVIEW_FPS_RANGE, fpsRangeValues.c_str());
set(KEY_SUPPORTED_PREVIEW_FPS_RANGE, fpsRangeValues.string());
int min_fps =
int(m_pCapability->fps_ranges_tbl[default_fps_index].min_fps * 1000);
@ -6071,8 +6071,8 @@ int32_t QCameraParameters::initDefaultParameters()
// Set legacy preview fps
String8 fpsValues = createFpsString(m_pCapability->fps_ranges_tbl[default_fps_index]);
set(KEY_SUPPORTED_PREVIEW_FRAME_RATES, fpsValues.c_str());
LOGH("supported fps rates: %s", fpsValues.c_str());
set(KEY_SUPPORTED_PREVIEW_FRAME_RATES, fpsValues.string());
LOGH("supported fps rates: %s", fpsValues.string());
CameraParameters::setPreviewFrameRate(int(m_pCapability->fps_ranges_tbl[default_fps_index].max_fps));
} else {
LOGW("supported fps ranges cnt is 0 or exceeds max!!!");
@ -6161,7 +6161,7 @@ int32_t QCameraParameters::initDefaultParameters()
manualFocusModes.append(",");
manualFocusModes.append(KEY_QC_FOCUS_DIOPTER_MODE);
}
set(KEY_QC_SUPPORTED_MANUAL_FOCUS_MODES, manualFocusModes.c_str());
set(KEY_QC_SUPPORTED_MANUAL_FOCUS_MODES, manualFocusModes.string());
// Set Saturation
set(KEY_QC_MIN_SATURATION, m_pCapability->saturation_ctrl.min_value);
@ -6199,7 +6199,7 @@ int32_t QCameraParameters::initDefaultParameters()
m_pCapability->supported_aec_modes_cnt,
AUTO_EXPOSURE_MAP,
PARAM_MAP_SIZE(AUTO_EXPOSURE_MAP));
set(KEY_QC_SUPPORTED_AUTO_EXPOSURE, autoExposureValues.c_str());
set(KEY_QC_SUPPORTED_AUTO_EXPOSURE, autoExposureValues.string());
setAutoExposure(AUTO_EXPOSURE_CENTER_WEIGHTED);
// Set Exposure Compensation
@ -6214,7 +6214,7 @@ int32_t QCameraParameters::initDefaultParameters()
m_pCapability->supported_instant_aec_modes_cnt,
INSTANT_AEC_MODES_MAP,
PARAM_MAP_SIZE(INSTANT_AEC_MODES_MAP));
set(KEY_QC_INSTANT_AEC_SUPPORTED_MODES, instantAECModes.c_str());
set(KEY_QC_INSTANT_AEC_SUPPORTED_MODES, instantAECModes.string());
// Set Instant Capture modes
String8 instantCaptureModes = createValuesString(
@ -6222,7 +6222,7 @@ int32_t QCameraParameters::initDefaultParameters()
m_pCapability->supported_instant_aec_modes_cnt,
INSTANT_CAPTURE_MODES_MAP,
PARAM_MAP_SIZE(INSTANT_CAPTURE_MODES_MAP));
set(KEY_QC_INSTANT_CAPTURE_SUPPORTED_MODES, instantCaptureModes.c_str());
set(KEY_QC_INSTANT_CAPTURE_SUPPORTED_MODES, instantCaptureModes.string());
// Set Antibanding
@ -6279,7 +6279,7 @@ int32_t QCameraParameters::initDefaultParameters()
manualWBModes.append(",");
manualWBModes.append(KEY_QC_WB_GAIN_MODE);
}
set(KEY_QC_SUPPORTED_MANUAL_WB_MODES, manualWBModes.c_str());
set(KEY_QC_SUPPORTED_MANUAL_WB_MODES, manualWBModes.string());
// Set Flash mode
if(m_pCapability->supported_flash_modes_cnt > 0) {
@ -6376,7 +6376,7 @@ int32_t QCameraParameters::initDefaultParameters()
manualExpModes.append(KEY_QC_USER_SETTING);
}
//finally set supported manual exposure modes
set(KEY_QC_SUPPORTED_MANUAL_EXPOSURE_MODES, manualExpModes.c_str());
set(KEY_QC_SUPPORTED_MANUAL_EXPOSURE_MODES, manualExpModes.string());
// Set HFR
String8 hfrValues = createHfrValuesString(
@ -6384,14 +6384,14 @@ int32_t QCameraParameters::initDefaultParameters()
m_pCapability->hfr_tbl_cnt,
HFR_MODES_MAP,
PARAM_MAP_SIZE(HFR_MODES_MAP));
set(KEY_QC_SUPPORTED_VIDEO_HIGH_FRAME_RATE_MODES, hfrValues.c_str());
set(KEY_QC_SUPPORTED_VIDEO_HIGH_FRAME_RATE_MODES, hfrValues.string());
set(KEY_QC_VIDEO_HIGH_SPEED_RECORDING, "off");
set(KEY_QC_VIDEO_HIGH_FRAME_RATE, "off");
String8 hfrSizeValues = createHfrSizesString(
m_pCapability->hfr_tbl,
m_pCapability->hfr_tbl_cnt);
set(KEY_QC_SUPPORTED_HFR_SIZES, hfrSizeValues.c_str());
LOGD("HFR values = %s HFR Sizes = %s", hfrValues.c_str(), hfrSizeValues.c_str());
set(KEY_QC_SUPPORTED_HFR_SIZES, hfrSizeValues.string());
LOGD("HFR values = %s HFR Sizes = %s", hfrValues.string(), hfrSizeValues.string());
setHighFrameRate(CAM_HFR_MODE_OFF);
// Set Focus algorithms
@ -6522,7 +6522,7 @@ int32_t QCameraParameters::initDefaultParameters()
if ((m_pCapability->qcom_supported_feature_mask & CAM_QCOM_FEATURE_DENOISE2D) > 0){
String8 denoiseValues = createValuesStringFromMap(
DENOISE_ON_OFF_MODES_MAP, PARAM_MAP_SIZE(DENOISE_ON_OFF_MODES_MAP));
set(KEY_QC_SUPPORTED_DENOISE, denoiseValues.c_str());
set(KEY_QC_SUPPORTED_DENOISE, denoiseValues.string());
#ifdef DEFAULT_DENOISE_MODE_ON
setWaveletDenoise(DENOISE_ON);
#else
@ -6742,7 +6742,7 @@ int32_t QCameraParameters::initDefaultParameters()
if (m_pCapability->qcom_supported_feature_mask & CAM_QCOM_FEATURE_ROTATION) {
videoRotationValues = createValuesStringFromMap(VIDEO_ROTATION_MODES_MAP,
PARAM_MAP_SIZE(VIDEO_ROTATION_MODES_MAP));
set(KEY_QC_SUPPORTED_VIDEO_ROTATION_VALUES, videoRotationValues.c_str());
set(KEY_QC_SUPPORTED_VIDEO_ROTATION_VALUES, videoRotationValues.string());
} else {
set(KEY_QC_SUPPORTED_VIDEO_ROTATION_VALUES, VIDEO_ROTATION_0);
}
@ -6756,7 +6756,7 @@ int32_t QCameraParameters::initDefaultParameters()
// Set min max values for Blur values (min: 0, max: 100, step: 1)
if (isDualCamAvailable()) {
String8 minMaxValues = createMinMaxValuesString(MIN_BLUR, MAX_BLUR, BLUR_STEP);
set(KEY_QC_SUPPORTED_DEGREES_OF_BLUR, minMaxValues.c_str());
set(KEY_QC_SUPPORTED_DEGREES_OF_BLUR, minMaxValues.string());
set(KEY_QC_IS_BOKEH_MODE_SUPPORTED, 1);
set(KEY_QC_IS_BOKEH_MPO_SUPPORTED, 1);
set(KEY_QC_BOKEH_MODE, 0);
@ -6764,7 +6764,7 @@ int32_t QCameraParameters::initDefaultParameters()
set(KEY_QC_BOKEH_MPO_MODE, 0);
} else {
String8 minMaxValues = createMinMaxValuesString(0, 0, 0);
set(KEY_QC_SUPPORTED_DEGREES_OF_BLUR, minMaxValues.c_str());
set(KEY_QC_SUPPORTED_DEGREES_OF_BLUR, minMaxValues.string());
set(KEY_QC_IS_BOKEH_MODE_SUPPORTED, 0);
set(KEY_QC_IS_BOKEH_MPO_SUPPORTED, 0);
set(KEY_QC_BOKEH_MODE, 0);
@ -11235,7 +11235,7 @@ char* QCameraParameters::getParameters()
strParams = (char *)malloc(sizeof(char)*(str.length()+1));
if(strParams != NULL){
memset(strParams, 0, sizeof(char)*(str.length()+1));
strlcpy(strParams, str.c_str(), str.length()+1);
strlcpy(strParams, str.string(), str.length()+1);
strParams[str.length()] = 0;
}
@ -12194,8 +12194,8 @@ int32_t QCameraParameters::updateFocusDistances(cam_focus_distances_info_t *focu
str.append(buffer);
}
}
LOGH("setting KEY_FOCUS_DISTANCES as %s", __FUNCTION__, str.c_str());
set(QCameraParameters::KEY_FOCUS_DISTANCES, str.c_str());
LOGH("setting KEY_FOCUS_DISTANCES as %s", __FUNCTION__, str.string());
set(QCameraParameters::KEY_FOCUS_DISTANCES, str.string());
return NO_ERROR;
}

2
camera/QCamera2/HAL/QCameraPostProc.cpp
View file

@ -1855,7 +1855,7 @@ void QCameraPostProcessor::releaseNotifyData(void *user_data,
String8 unlinkPath((const char *) app_cb->release_data.data->data,
app_cb->release_data.data->size);
int rc = unlink(unlinkPath.c_str());
int rc = unlink(unlinkPath.string());
LOGH("Unlinking stored file rc = %d",
rc);
}

2
camera/QCamera2/HAL3/QCamera3HWI.cpp
View file

@ -11046,7 +11046,7 @@ void QCamera3HardwareInterface::dumpMetadataToFile(tuning_params_t &meta,
type,
frameNumber);
filePath.append(buf);
int file_fd = open(filePath.c_str(), O_RDWR | O_CREAT, 0777);
int file_fd = open(filePath.string(), O_RDWR | O_CREAT, 0777);
if (file_fd >= 0) {
ssize_t written_len = 0;
meta.tuning_data_version = TUNING_DATA_VERSION;

12
camera/QCamera2/HAL3/QCamera3PostProc.cpp
View file

@ -4000,17 +4000,17 @@ QCamera3Exif *QCamera3PostProcessor::getExifData(metadata_buffer_t *metadata,
rc = getExifDateTime(dateTime, subsecTime);
if (rc == NO_ERROR) {
exif->addEntry(EXIFTAGID_DATE_TIME, EXIF_ASCII,
(uint32_t)(dateTime.length() + 1), (void *)dateTime.c_str());
(uint32_t)(dateTime.length() + 1), (void *)dateTime.string());
exif->addEntry(EXIFTAGID_EXIF_DATE_TIME_ORIGINAL, EXIF_ASCII,
(uint32_t)(dateTime.length() + 1), (void *)dateTime.c_str());
(uint32_t)(dateTime.length() + 1), (void *)dateTime.string());
exif->addEntry(EXIFTAGID_EXIF_DATE_TIME_DIGITIZED, EXIF_ASCII,
(uint32_t)(dateTime.length() + 1), (void *)dateTime.c_str());
(uint32_t)(dateTime.length() + 1), (void *)dateTime.string());
exif->addEntry(EXIFTAGID_SUBSEC_TIME, EXIF_ASCII,
(uint32_t)(subsecTime.length() + 1), (void *)subsecTime.c_str());
(uint32_t)(subsecTime.length() + 1), (void *)subsecTime.string());
exif->addEntry(EXIFTAGID_SUBSEC_TIME_ORIGINAL, EXIF_ASCII,
(uint32_t)(subsecTime.length() + 1), (void *)subsecTime.c_str());
(uint32_t)(subsecTime.length() + 1), (void *)subsecTime.string());
exif->addEntry(EXIFTAGID_SUBSEC_TIME_DIGITIZED, EXIF_ASCII,
(uint32_t)(subsecTime.length() + 1), (void *)subsecTime.c_str());
(uint32_t)(subsecTime.length() + 1), (void *)subsecTime.string());
} else {
LOGW("getExifDateTime failed");
}

2
camera/QCamera2/stack/common/mm_camera_shim.h
View file

@ -94,6 +94,6 @@ typedef struct {
int32_t (*mm_camera_shim_send_cmd)(cam_shim_packet_t *event);
} mm_camera_shim_ops_t;
extern int32_t (*mm_camera_shim_module_init)(mm_camera_shim_ops_t *shim_ops);
int32_t (*mm_camera_shim_module_init)(mm_camera_shim_ops_t *shim_ops);
#endif /*__MM_CAMERA_SHIMLAYER_H_*/

2
camera/QCamera2/stack/mm-camera-interface/src/mm_camera_interface.c
View file

@ -51,8 +51,6 @@
#include "mm_camera.h"
#include "mm_camera_muxer.h"
int32_t (*mm_camera_shim_module_init)(mm_camera_shim_ops_t *shim_ops);
static pthread_mutex_t g_intf_lock = PTHREAD_MUTEX_INITIALIZER;
static mm_camera_ctrl_t g_cam_ctrl;

2
camera/QCamera2/stack/mm-camera-interface/src/mm_camera_stream.c
View file

@ -882,7 +882,7 @@ int32_t mm_stream_fsm_reg(mm_stream_t * my_obj,
pthread_mutex_lock(&my_obj->cmd_lock);
if (has_cb) {
snprintf(my_obj->cmd_thread.threadName, THREAD_NAME_SIZE, "CAM_StrmAppDat");
snprintf(my_obj->cmd_thread.threadName, THREAD_NAME_SIZE, "CAM_StrmAppData");
mm_camera_cmd_thread_launch(&my_obj->cmd_thread,
mm_stream_dispatch_app_data,
(void *)my_obj);

10
camera/QCamera2/util/QCameraBokeh.cpp
View file

@ -699,8 +699,8 @@ int32_t QCameraBokeh::doBokehProcess(
auxiliaryStrideY, auxiliaryStrideVU,
pDepthMap, depthStride,
goodRoi.left, goodRoi.top, goodRoi.width,goodRoi.height,
inParams.sMainReprocessInfo.c_str(), inParams.sAuxReprocessInfo.c_str(),
inParams.sCalibData.c_str(), focalLengthPrimaryCamera, config, ddmMode);
inParams.sMainReprocessInfo.string(), inParams.sAuxReprocessInfo.string(),
inParams.sCalibData.string(), focalLengthPrimaryCamera, config, ddmMode);
if (!status.ok()) {
LOGE("depth map generation failed: %s, errorcode %d",
@ -960,10 +960,10 @@ String8 QCameraBokeh::extractCalibrationData()
calibData.appendFormat(CALIB_FMT_STRINGS[11],
buildCommaSeparatedString(calib_data.relative_rotation_matrix,
RELCAM_CALIB_ROT_MATRIX_MAX).c_str());
RELCAM_CALIB_ROT_MATRIX_MAX).string());
calibData.appendFormat(CALIB_FMT_STRINGS[12],
buildCommaSeparatedString(calib_data.relative_geometric_surface_parameters,
RELCAM_CALIB_SURFACE_PARMS_MAX).c_str());
RELCAM_CALIB_SURFACE_PARMS_MAX).string());
calibData.appendFormat(CALIB_FMT_STRINGS[13], calib_data.relative_principle_point_x_offset);
calibData.appendFormat(CALIB_FMT_STRINGS[14], calib_data.relative_principle_point_y_offset);
@ -990,7 +990,7 @@ void QCameraBokeh::dumpInputParams(const char* file, String8 str, uint32_t idx)
int file_fd = open(filename, O_RDWR | O_CREAT, 0777);
if (file_fd > 0) {
fchmod(file_fd, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
write(file_fd, str.c_str(), str.size());
write(file_fd, str.string(), str.size());
close(file_fd);
}
}

7
device.mk
View file

@ -12,13 +12,6 @@ $(call inherit-product, device/xiaomi/sdm660-common/sdm660.mk)
# Device Path
DEVICE_PATH := device/xiaomi/clover
# OTA
PRODUCT_PACKAGES += \
Updater
# Keys
include vendor/voltage-priv/keys/keys.mk
# PRODUCT_SHIPPING_API_LEVEL indicates the first api level, device has been commercially launched on.
PRODUCT_SHIPPING_API_LEVEL := 27

4
voltage_clover.mk → lineage_clover.mk
View file

@ -22,7 +22,7 @@
#
# Inherit some common Arrow stuff
$(call inherit-product, vendor/voltage/config/common_full_tablet_wifionly.mk)
$(call inherit-product, vendor/lineage/config/common_full_tablet.mk)
# Inherit device configuration
$(call inherit-product, device/xiaomi/clover/device.mk)
@ -30,7 +30,7 @@ $(call inherit-product, device/xiaomi/clover/device.mk)
# Device identifier
PRODUCT_BRAND := Xiaomi
PRODUCT_MANUFACTURER := Xiaomi
PRODUCT_NAME := voltage_clover
PRODUCT_NAME := lineage_clover
PRODUCT_CHARACTERISTICS := tablet
PRODUCT_DEVICE := clover
PRODUCT_MODEL := MI PAD 4

2
manifest.xml
View file

@ -23,7 +23,7 @@ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-->
<manifest version="1.0" type="device" target-level="5">
<manifest version="1.0" type="device" target-level="4">
<hal format="hidl">
<name>android.hardware.keymaster</name>
<transport>hwbinder</transport>