From 2d30abc6710880dfc805bea8df995847483fd2ed Mon Sep 17 00:00:00 2001 From: Naseer Ahmed Date: Thu, 13 Jun 2013 19:44:09 -0400 Subject: [PATCH 1/4] deb: Start ppd when surfaceflinger is running Bug: 9418053 Change-Id: I384f47d5b148e7ecd8a86ceb0354f2d4803ddc1c Signed-off-by: Iliyan Malchev --- init.deb.rc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/init.deb.rc b/init.deb.rc index 32eb036..d10cf98 100644 --- a/init.deb.rc +++ b/init.deb.rc @@ -419,6 +419,7 @@ service mpdecision /system/bin/mpdecision --no_sleep --avg_comp service ppd /system/bin/mm-pp-daemon -s class late_start + disabled user system socket pps stream 0660 system system graphics group system graphics @@ -457,5 +458,8 @@ service diag_mdlog /system/bin/logwrapper /system/bin/diag_mdlog -s 100 class late_start disabled +on property:init.svc.surfaceflinger=running + start ppd + on property:init.svc.surfaceflinger=stopped stop ppd From 10afb903066d9152be024fed8ae6091865f4df65 Mon Sep 17 00:00:00 2001 From: Wink Saville Date: Tue, 18 Jun 2013 15:45:24 -0700 Subject: [PATCH 2/4] Add config_show4GForLte false to US carrier config.xml By default we now show 4G instead of LTE by changing config_show4GForLte to true in frameworks/base/packages/SystemUI/res/values/config.xml So for US carriers we are adding a config.xml which has config_show4GForLte to false. The list of overlays comes from looking for mcc=310 & mcc=311 in the apns-conf.xml for vendor deb. Bug: 9265217 Change-Id: I962910de7826ce9825de2d2dfb9e50b84d0e7c75 --- .../values/values-mcc310-mnc090/config.xml | 25 +++++++++++++++++++ .../values/values-mcc310-mnc150/config.xml | 25 +++++++++++++++++++ .../values/values-mcc310-mnc160/config.xml | 25 +++++++++++++++++++ .../values/values-mcc310-mnc200/config.xml | 25 +++++++++++++++++++ .../values/values-mcc310-mnc210/config.xml | 25 +++++++++++++++++++ .../values/values-mcc310-mnc230/config.xml | 25 +++++++++++++++++++ .../values/values-mcc310-mnc240/config.xml | 25 +++++++++++++++++++ .../values/values-mcc310-mnc250/config.xml | 25 +++++++++++++++++++ .../res/values/values-mcc310-mnc26/config.xml | 25 +++++++++++++++++++ .../values/values-mcc310-mnc260/config.xml | 25 +++++++++++++++++++ .../values/values-mcc310-mnc270/config.xml | 25 +++++++++++++++++++ .../res/values/values-mcc310-mnc31/config.xml | 25 +++++++++++++++++++ .../values/values-mcc310-mnc380/config.xml | 25 +++++++++++++++++++ .../values/values-mcc310-mnc410/config.xml | 25 +++++++++++++++++++ .../values/values-mcc310-mnc560/config.xml | 25 +++++++++++++++++++ .../values/values-mcc310-mnc660/config.xml | 25 +++++++++++++++++++ .../values/values-mcc310-mnc680/config.xml | 25 +++++++++++++++++++ .../values/values-mcc310-mnc980/config.xml | 25 +++++++++++++++++++ .../values/values-mcc310-mnc990/config.xml | 25 +++++++++++++++++++ .../values/values-mcc311-mnc480/config.xml | 25 +++++++++++++++++++ 20 files changed, 500 insertions(+) create mode 100644 overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc090/config.xml create mode 100644 overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc150/config.xml create mode 100644 overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc160/config.xml create mode 100644 overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc200/config.xml create mode 100644 overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc210/config.xml create mode 100644 overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc230/config.xml create mode 100644 overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc240/config.xml create mode 100644 overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc250/config.xml create mode 100644 overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc26/config.xml create mode 100644 overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc260/config.xml create mode 100644 overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc270/config.xml create mode 100644 overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc31/config.xml create mode 100644 overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc380/config.xml create mode 100644 overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc410/config.xml create mode 100644 overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc560/config.xml create mode 100644 overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc660/config.xml create mode 100644 overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc680/config.xml create mode 100644 overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc980/config.xml create mode 100644 overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc990/config.xml create mode 100644 overlay/frameworks/base/packages/SystemUI/res/values/values-mcc311-mnc480/config.xml diff --git a/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc090/config.xml b/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc090/config.xml new file mode 100644 index 0000000..e1f4e67 --- /dev/null +++ b/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc090/config.xml @@ -0,0 +1,25 @@ + + + + + + + false + diff --git a/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc150/config.xml b/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc150/config.xml new file mode 100644 index 0000000..e1f4e67 --- /dev/null +++ b/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc150/config.xml @@ -0,0 +1,25 @@ + + + + + + + false + diff --git a/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc160/config.xml b/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc160/config.xml new file mode 100644 index 0000000..e1f4e67 --- /dev/null +++ b/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc160/config.xml @@ -0,0 +1,25 @@ + + + + + + + false + diff --git a/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc200/config.xml b/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc200/config.xml new file mode 100644 index 0000000..e1f4e67 --- /dev/null +++ b/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc200/config.xml @@ -0,0 +1,25 @@ + + + + + + + false + diff --git a/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc210/config.xml b/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc210/config.xml new file mode 100644 index 0000000..e1f4e67 --- /dev/null +++ b/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc210/config.xml @@ -0,0 +1,25 @@ + + + + + + + false + diff --git a/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc230/config.xml b/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc230/config.xml new file mode 100644 index 0000000..e1f4e67 --- /dev/null +++ b/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc230/config.xml @@ -0,0 +1,25 @@ + + + + + + + false + diff --git a/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc240/config.xml b/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc240/config.xml new file mode 100644 index 0000000..e1f4e67 --- /dev/null +++ b/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc240/config.xml @@ -0,0 +1,25 @@ + + + + + + + false + diff --git a/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc250/config.xml b/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc250/config.xml new file mode 100644 index 0000000..e1f4e67 --- /dev/null +++ b/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc250/config.xml @@ -0,0 +1,25 @@ + + + + + + + false + diff --git a/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc26/config.xml b/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc26/config.xml new file mode 100644 index 0000000..e1f4e67 --- /dev/null +++ b/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc26/config.xml @@ -0,0 +1,25 @@ + + + + + + + false + diff --git a/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc260/config.xml b/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc260/config.xml new file mode 100644 index 0000000..e1f4e67 --- /dev/null +++ b/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc260/config.xml @@ -0,0 +1,25 @@ + + + + + + + false + diff --git a/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc270/config.xml b/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc270/config.xml new file mode 100644 index 0000000..e1f4e67 --- /dev/null +++ b/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc270/config.xml @@ -0,0 +1,25 @@ + + + + + + + false + diff --git a/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc31/config.xml b/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc31/config.xml new file mode 100644 index 0000000..e1f4e67 --- /dev/null +++ b/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc31/config.xml @@ -0,0 +1,25 @@ + + + + + + + false + diff --git a/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc380/config.xml b/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc380/config.xml new file mode 100644 index 0000000..e1f4e67 --- /dev/null +++ b/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc380/config.xml @@ -0,0 +1,25 @@ + + + + + + + false + diff --git a/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc410/config.xml b/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc410/config.xml new file mode 100644 index 0000000..e1f4e67 --- /dev/null +++ b/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc410/config.xml @@ -0,0 +1,25 @@ + + + + + + + false + diff --git a/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc560/config.xml b/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc560/config.xml new file mode 100644 index 0000000..e1f4e67 --- /dev/null +++ b/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc560/config.xml @@ -0,0 +1,25 @@ + + + + + + + false + diff --git a/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc660/config.xml b/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc660/config.xml new file mode 100644 index 0000000..e1f4e67 --- /dev/null +++ b/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc660/config.xml @@ -0,0 +1,25 @@ + + + + + + + false + diff --git a/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc680/config.xml b/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc680/config.xml new file mode 100644 index 0000000..e1f4e67 --- /dev/null +++ b/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc680/config.xml @@ -0,0 +1,25 @@ + + + + + + + false + diff --git a/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc980/config.xml b/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc980/config.xml new file mode 100644 index 0000000..e1f4e67 --- /dev/null +++ b/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc980/config.xml @@ -0,0 +1,25 @@ + + + + + + + false + diff --git a/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc990/config.xml b/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc990/config.xml new file mode 100644 index 0000000..e1f4e67 --- /dev/null +++ b/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc990/config.xml @@ -0,0 +1,25 @@ + + + + + + + false + diff --git a/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc311-mnc480/config.xml b/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc311-mnc480/config.xml new file mode 100644 index 0000000..e1f4e67 --- /dev/null +++ b/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc311-mnc480/config.xml @@ -0,0 +1,25 @@ + + + + + + + false + From 7abccb5ea65f9e886e8d98a3c9114ae019772682 Mon Sep 17 00:00:00 2001 From: Iliyan Malchev Date: Wed, 19 Jun 2013 15:49:31 -0700 Subject: [PATCH 3/4] deb: update camera kernel headers Bug: 9316451 Change-Id: Iafbea5c3f0b39f9613cc13611670a0daa6554a5e Signed-off-by: Iliyan Malchev --- kernel-headers/media/msm_cam_sensor.h | 96 ++++++++++--------- .../media/msm_cam_sensor.h | 9 ++ 2 files changed, 62 insertions(+), 43 deletions(-) diff --git a/kernel-headers/media/msm_cam_sensor.h b/kernel-headers/media/msm_cam_sensor.h index 1a76179..a9e8748 100644 --- a/kernel-headers/media/msm_cam_sensor.h +++ b/kernel-headers/media/msm_cam_sensor.h @@ -298,221 +298,231 @@ struct sensorb_cfg_data { /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ uint8_t wb_val; int8_t exp_compensation; + int8_t fps; } cfg; -}; /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +}; struct csid_cfg_data { enum csid_cfg_type_t cfgtype; union { - uint32_t csid_version; /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + uint32_t csid_version; struct msm_camera_csid_params *csid_params; } cfg; }; -struct csiphy_cfg_data { /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +struct csiphy_cfg_data { enum csiphy_cfg_type_t cfgtype; union { struct msm_camera_csiphy_params *csiphy_params; - struct msm_camera_csi_lane_params *csi_lane_params; /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + struct msm_camera_csi_lane_params *csi_lane_params; } cfg; }; enum eeprom_cfg_type_t { - CFG_EEPROM_GET_INFO, /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + CFG_EEPROM_GET_INFO, CFG_EEPROM_GET_DATA, CFG_EEPROM_READ_DATA, CFG_EEPROM_WRITE_DATA, -}; /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +}; struct eeprom_get_t { uint16_t num_bytes; }; +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ struct eeprom_read_t { -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ uint8_t *dbuffer; uint16_t num_bytes; }; +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ struct eeprom_write_t { -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ uint8_t *dbuffer; uint16_t num_bytes; }; -struct msm_eeprom_cfg_data { /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +struct msm_eeprom_cfg_data { enum eeprom_cfg_type_t cfgtype; uint8_t is_supported; union { - char eeprom_name[MAX_SENSOR_NAME]; /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + char eeprom_name[MAX_SENSOR_NAME]; struct eeprom_get_t get_data; struct eeprom_read_t read_data; struct eeprom_write_t write_data; - } cfg; /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + } cfg; }; enum msm_sensor_cfg_type_t { CFG_SET_SLAVE_INFO, - CFG_WRITE_I2C_ARRAY, /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + CFG_WRITE_I2C_ARRAY, CFG_WRITE_I2C_SEQ_ARRAY, CFG_POWER_UP, CFG_POWER_DOWN, - CFG_SET_STOP_STREAM_SETTING, /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + CFG_SET_STOP_STREAM_SETTING, CFG_GET_SENSOR_INFO, CFG_GET_SENSOR_INIT_PARAMS, CFG_SET_INIT_SETTING, - CFG_SET_RESOLUTION, /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + CFG_SET_RESOLUTION, CFG_SET_STOP_STREAM, CFG_SET_START_STREAM, CFG_SET_EFFECT, - CFG_SET_WB, /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + CFG_SET_WB, + CFG_SET_FPS, CFG_SET_EXPOSURE_COMPENSATION, }; +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ enum msm_actuator_cfg_type_t { CFG_GET_ACTUATOR_INFO, -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ CFG_SET_ACTUATOR_INFO, CFG_SET_DEFAULT_FOCUS, +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ CFG_MOVE_FOCUS, CFG_ACTUATOR_POWERDOWN, -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ }; enum actuator_type { +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ ACTUATOR_VCM, ACTUATOR_PIEZO, -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ }; enum msm_actuator_data_type { +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ MSM_ACTUATOR_BYTE_DATA = 1, MSM_ACTUATOR_WORD_DATA, -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ }; enum msm_actuator_addr_type { +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ MSM_ACTUATOR_BYTE_ADDR = 1, MSM_ACTUATOR_WORD_ADDR, -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ }; struct reg_settings_t { +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ uint16_t reg_addr; uint16_t reg_data; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ }; struct region_params_t { +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ uint16_t step_bound[2]; uint16_t code_per_step; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ }; struct damping_params_t { +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ uint32_t damping_step; uint32_t damping_delay; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ uint32_t hw_params; }; +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ struct msm_actuator_move_params_t { int8_t dir; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ int8_t sign_dir; int16_t dest_step_pos; +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ int32_t num_steps; struct damping_params_t *ringing_params; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ }; struct msm_actuator_tuning_params_t { +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ int16_t initial_code; uint16_t pwd_step; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ uint16_t region_size; uint32_t total_steps; +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ struct region_params_t *region_params; }; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ struct msm_actuator_params_t { enum actuator_type act_type; +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ uint8_t reg_tbl_size; uint16_t data_size; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ uint16_t init_setting_size; uint32_t i2c_addr; +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ enum msm_actuator_addr_type i2c_addr_type; enum msm_actuator_data_type i2c_data_type; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ struct msm_actuator_reg_params_t *reg_tbl_params; struct reg_settings_t *init_settings; +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ }; struct msm_actuator_set_info_t { -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ struct msm_actuator_params_t actuator_params; struct msm_actuator_tuning_params_t af_tuning_params; +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ }; struct msm_actuator_get_info_t { -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ uint32_t focal_length_num; uint32_t focal_length_den; +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ uint32_t f_number_num; uint32_t f_number_den; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ uint32_t f_pix_num; uint32_t f_pix_den; +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ uint32_t total_f_dist_num; uint32_t total_f_dist_den; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ uint32_t hor_view_angle_num; uint32_t hor_view_angle_den; +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ uint32_t ver_view_angle_num; uint32_t ver_view_angle_den; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ }; enum af_camera_name { +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ ACTUATOR_MAIN_CAM_0, ACTUATOR_MAIN_CAM_1, -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ ACTUATOR_MAIN_CAM_2, ACTUATOR_MAIN_CAM_3, +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ ACTUATOR_MAIN_CAM_4, ACTUATOR_MAIN_CAM_5, -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ ACTUATOR_WEB_CAM_0, ACTUATOR_WEB_CAM_1, +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ ACTUATOR_WEB_CAM_2, }; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define CAMERA_EFFECT_OFF 0 #define CAMERA_EFFECT_MONO 1 +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define CAMERA_EFFECT_NEGATIVE 2 #define CAMERA_EFFECT_SOLARIZE 3 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define CAMERA_EFFECT_SEPIA 4 #define CAMERA_EFFECT_POSTERIZE 5 +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define CAMERA_EFFECT_WHITEBOARD 6 #define CAMERA_EFFECT_BLACKBOARD 7 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define CAMERA_EFFECT_AQUA 8 #define CAMERA_EFFECT_EMBOSS 9 +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define CAMERA_EFFECT_SKETCH 10 #define CAMERA_EFFECT_NEON 11 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define CAMERA_EFFECT_MAX 12 #define YUV_CAMERA_WB_AUTO 0 +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define YUV_CAMERA_WB_CUSTOM 1 #define YUV_CAMERA_WB_INCANDESCENT 2 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define YUV_CAMERA_WB_FLUORESCENT 3 #define YUV_CAMERA_WB_DAYLIGHT 4 +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define YUV_CAMERA_WB_CLOUDY_DAYLIGHT 5 #define YUV_CAMERA_WB_TWILIGHT 6 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define YUV_CAMERA_WB_SHADE 7 #define CAMERA_EXPOSURE_COMPENSATION_LV0 12 +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define CAMERA_EXPOSURE_COMPENSATION_LV1 6 #define CAMERA_EXPOSURE_COMPENSATION_LV2 0 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define CAMERA_EXPOSURE_COMPENSATION_LV3 -6 #define CAMERA_EXPOSURE_COMPENSATION_LV4 -12 +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define CAMERA_FPS_FIX_30 30 +#define CAMERA_FPS_FIX_25 25 +#define CAMERA_FPS_FIX_24 24 +#define CAMERA_FPS_FIX_20 20 +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define CAMERA_FPS_FIX_15 15 +#define CAMERA_FPS_AUTO_30 0 struct msm_actuator_cfg_data { int cfgtype; /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ diff --git a/original-kernel-headers/media/msm_cam_sensor.h b/original-kernel-headers/media/msm_cam_sensor.h index fe56e25..4378fcc 100755 --- a/original-kernel-headers/media/msm_cam_sensor.h +++ b/original-kernel-headers/media/msm_cam_sensor.h @@ -269,6 +269,7 @@ struct sensorb_cfg_data { int8_t effect; uint8_t wb_val; int8_t exp_compensation; + int8_t fps; } cfg; }; @@ -334,6 +335,7 @@ enum msm_sensor_cfg_type_t { CFG_SET_START_STREAM, CFG_SET_EFFECT, CFG_SET_WB, + CFG_SET_FPS, CFG_SET_EXPOSURE_COMPENSATION, }; @@ -468,6 +470,13 @@ enum af_camera_name { #define CAMERA_EXPOSURE_COMPENSATION_LV3 -6 #define CAMERA_EXPOSURE_COMPENSATION_LV4 -12 +#define CAMERA_FPS_FIX_30 30 +#define CAMERA_FPS_FIX_25 25 +#define CAMERA_FPS_FIX_24 24 +#define CAMERA_FPS_FIX_20 20 +#define CAMERA_FPS_FIX_15 15 +#define CAMERA_FPS_AUTO_30 0 + struct msm_actuator_cfg_data { int cfgtype; uint8_t is_af_supported; From 206533eb63080607fd5113902a7302b8e13283c2 Mon Sep 17 00:00:00 2001 From: Wink Saville Date: Thu, 20 Jun 2013 18:23:46 -0700 Subject: [PATCH 4/4] Fix and simplify mcc config.xml specific values. I'd placed the config.xml files inside the values directory. They should have been up a level in the res directory. Also, since we currently want all US operators we need to just create two directories for mcc 310 and 311. Bug: 9513380 Change-Id: Id08848354b286b0ef7fab576a7de0376d1e7b888 --- .../config.xml | 0 .../config.xml | 0 .../packages/SystemUI/res/values/config.xml | 31 ------------------- .../values/values-mcc310-mnc160/config.xml | 25 --------------- .../values/values-mcc310-mnc200/config.xml | 25 --------------- .../values/values-mcc310-mnc210/config.xml | 25 --------------- .../values/values-mcc310-mnc230/config.xml | 25 --------------- .../values/values-mcc310-mnc240/config.xml | 25 --------------- .../values/values-mcc310-mnc250/config.xml | 25 --------------- .../res/values/values-mcc310-mnc26/config.xml | 25 --------------- .../values/values-mcc310-mnc260/config.xml | 25 --------------- .../values/values-mcc310-mnc270/config.xml | 25 --------------- .../res/values/values-mcc310-mnc31/config.xml | 25 --------------- .../values/values-mcc310-mnc380/config.xml | 25 --------------- .../values/values-mcc310-mnc410/config.xml | 25 --------------- .../values/values-mcc310-mnc560/config.xml | 25 --------------- .../values/values-mcc310-mnc660/config.xml | 25 --------------- .../values/values-mcc310-mnc680/config.xml | 25 --------------- .../values/values-mcc310-mnc980/config.xml | 25 --------------- .../values/values-mcc310-mnc990/config.xml | 25 --------------- .../values/values-mcc311-mnc480/config.xml | 25 --------------- 21 files changed, 481 deletions(-) rename overlay/frameworks/base/packages/SystemUI/res/{values/values-mcc310-mnc090 => values-mcc310}/config.xml (100%) rename overlay/frameworks/base/packages/SystemUI/res/{values/values-mcc310-mnc150 => values-mcc311}/config.xml (100%) delete mode 100644 overlay/frameworks/base/packages/SystemUI/res/values/config.xml delete mode 100644 overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc160/config.xml delete mode 100644 overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc200/config.xml delete mode 100644 overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc210/config.xml delete mode 100644 overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc230/config.xml delete mode 100644 overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc240/config.xml delete mode 100644 overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc250/config.xml delete mode 100644 overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc26/config.xml delete mode 100644 overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc260/config.xml delete mode 100644 overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc270/config.xml delete mode 100644 overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc31/config.xml delete mode 100644 overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc380/config.xml delete mode 100644 overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc410/config.xml delete mode 100644 overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc560/config.xml delete mode 100644 overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc660/config.xml delete mode 100644 overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc680/config.xml delete mode 100644 overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc980/config.xml delete mode 100644 overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc990/config.xml delete mode 100644 overlay/frameworks/base/packages/SystemUI/res/values/values-mcc311-mnc480/config.xml diff --git a/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc090/config.xml b/overlay/frameworks/base/packages/SystemUI/res/values-mcc310/config.xml similarity index 100% rename from overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc090/config.xml rename to overlay/frameworks/base/packages/SystemUI/res/values-mcc310/config.xml diff --git a/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc150/config.xml b/overlay/frameworks/base/packages/SystemUI/res/values-mcc311/config.xml similarity index 100% rename from overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc150/config.xml rename to overlay/frameworks/base/packages/SystemUI/res/values-mcc311/config.xml diff --git a/overlay/frameworks/base/packages/SystemUI/res/values/config.xml b/overlay/frameworks/base/packages/SystemUI/res/values/config.xml deleted file mode 100644 index bf2577e..0000000 --- a/overlay/frameworks/base/packages/SystemUI/res/values/config.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - true - - - 7 - - diff --git a/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc160/config.xml b/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc160/config.xml deleted file mode 100644 index e1f4e67..0000000 --- a/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc160/config.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - false - diff --git a/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc200/config.xml b/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc200/config.xml deleted file mode 100644 index e1f4e67..0000000 --- a/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc200/config.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - false - diff --git a/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc210/config.xml b/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc210/config.xml deleted file mode 100644 index e1f4e67..0000000 --- a/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc210/config.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - false - diff --git a/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc230/config.xml b/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc230/config.xml deleted file mode 100644 index e1f4e67..0000000 --- a/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc230/config.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - false - diff --git a/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc240/config.xml b/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc240/config.xml deleted file mode 100644 index e1f4e67..0000000 --- a/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc240/config.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - false - diff --git a/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc250/config.xml b/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc250/config.xml deleted file mode 100644 index e1f4e67..0000000 --- a/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc250/config.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - false - diff --git a/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc26/config.xml b/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc26/config.xml deleted file mode 100644 index e1f4e67..0000000 --- a/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc26/config.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - false - diff --git a/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc260/config.xml b/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc260/config.xml deleted file mode 100644 index e1f4e67..0000000 --- a/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc260/config.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - false - diff --git a/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc270/config.xml b/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc270/config.xml deleted file mode 100644 index e1f4e67..0000000 --- a/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc270/config.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - false - diff --git a/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc31/config.xml b/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc31/config.xml deleted file mode 100644 index e1f4e67..0000000 --- a/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc31/config.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - false - diff --git a/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc380/config.xml b/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc380/config.xml deleted file mode 100644 index e1f4e67..0000000 --- a/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc380/config.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - false - diff --git a/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc410/config.xml b/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc410/config.xml deleted file mode 100644 index e1f4e67..0000000 --- a/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc410/config.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - false - diff --git a/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc560/config.xml b/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc560/config.xml deleted file mode 100644 index e1f4e67..0000000 --- a/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc560/config.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - false - diff --git a/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc660/config.xml b/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc660/config.xml deleted file mode 100644 index e1f4e67..0000000 --- a/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc660/config.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - false - diff --git a/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc680/config.xml b/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc680/config.xml deleted file mode 100644 index e1f4e67..0000000 --- a/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc680/config.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - false - diff --git a/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc980/config.xml b/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc980/config.xml deleted file mode 100644 index e1f4e67..0000000 --- a/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc980/config.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - false - diff --git a/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc990/config.xml b/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc990/config.xml deleted file mode 100644 index e1f4e67..0000000 --- a/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc310-mnc990/config.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - false - diff --git a/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc311-mnc480/config.xml b/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc311-mnc480/config.xml deleted file mode 100644 index e1f4e67..0000000 --- a/overlay/frameworks/base/packages/SystemUI/res/values/values-mcc311-mnc480/config.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - false -