Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Kk 4.4.1 #1

Merged
merged 14 commits into from Dec 14, 2013
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions WCNSS_qcom_cfg.ini
Original file line number Diff line number Diff line change
Expand Up @@ -232,16 +232,17 @@ gNumChanCombinedConc=255

# TDLS configuration
gEnableTDLSSupport=1
gEnableTDLSImplicitTrigger=0
gTDLSTxStatsPeriod=5000
gTDLSTxPacketThreshold=100
gEnableTDLSImplicitTrigger=1
gTDLSExternalControl=1
gTDLSTxStatsPeriod=500
gTDLSTxPacketThreshold=10
gTDLSDiscoveryPeriod=20000
gTDLSMaxDiscoveryAttempt=5
gTDLSIdleTimeout=5000
gTDLSIdleTimeout=40000
gTDLSRssiHysteresis=100
gTDLSRSSITriggerThreshold=-75
gTDLSRSSITriggerThreshold=-60
gTDLSIdlePacketThreshold=5
gTDLSRSSITeardownThreshold=-75
gTDLSRSSITeardownThreshold=-70

END
# Note: Configuration parser would not read anything past the END marker
1 change: 1 addition & 0 deletions bluetooth/bdroid_buildcfg.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,5 @@
#define BTM_DEF_LOCAL_NAME "Nexus 4"
#define BTA_DISABLE_DELAY 1000 /* in milliseconds */
#define BTA_HOST_INTERLEAVE_SEARCH TRUE
#define BTA_SKIP_BLE_READ_REMOTE_FEAT TRUE
#endif
6 changes: 5 additions & 1 deletion camera/QCameraHWI.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1232,7 +1232,11 @@ void QCameraHardwareInterface::stopPreview()
stopPreviewInternal();
mPreviewState = QCAMERA_HAL_PREVIEW_STOPPED;
break;
case QCAMERA_HAL_TAKE_PICTURE:
case QCAMERA_HAL_TAKE_PICTURE:
cancelPictureInternal();
stopPreviewInternal();
mPreviewState = QCAMERA_HAL_PREVIEW_STOPPED;
break;
case QCAMERA_HAL_PREVIEW_STOPPED:
default:
break;
Expand Down
4 changes: 2 additions & 2 deletions init.mako.rc
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,7 @@ service qcamerasvr /system/bin/mm-qcamera-daemon
user camera
group camera system inet input

service conn_init /system/bin/logwrapper /system/bin/conn_init
service conn_init /system/bin/conn_init
class late_start
user system
group system wifi
Expand All @@ -431,7 +431,7 @@ service qseecomd /system/bin/qseecomd
user system
group system

service diag_mdlog /system/bin/logwrapper /system/bin/diag_mdlog -s 100
service diag_mdlog /system/bin/diag_mdlog -s 100
class late_start
disabled

Expand Down
27 changes: 20 additions & 7 deletions proprietary-blobs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
/system/bin/usbhub
/system/bin/usbhub_init
/system/bin/v4l2-qcamera-app
/system/etc/DxHDCP.cfg
/system/etc/firmware/tzapps.b00
/system/etc/firmware/tzapps.b01
/system/etc/firmware/tzapps.b02
Expand Down Expand Up @@ -103,7 +102,6 @@
/system/lib/libdss.so
/system/lib/libdsucsd.so
/system/lib/libdsutils.so
/system/lib/libDxHdcp.so
/system/lib/libgemini.so
/system/lib/libgps.utils.so
/system/lib/libgsl.so
Expand Down Expand Up @@ -160,16 +158,31 @@
/system/vendor/firmware/a300_pm4.fw
/system/vendor/firmware/bcm2079x_firmware.ncd
/system/vendor/firmware/bcm2079x_pre_firmware.ncd
/system/vendor/firmware/discretix/dxhdcp2.b00
/system/vendor/firmware/discretix/dxhdcp2.b01
/system/vendor/firmware/discretix/dxhdcp2.b02
/system/vendor/firmware/discretix/dxhdcp2.b03
/system/vendor/firmware/discretix/dxhdcp2.mdt
/system/vendor/firmware/dsps.b00
/system/vendor/firmware/dsps.b01
/system/vendor/firmware/dsps.b02
/system/vendor/firmware/dsps.b03
/system/vendor/firmware/dsps.b04
/system/vendor/firmware/dsps.b05
/system/vendor/firmware/dsps.mdt
/system/vendor/firmware/keymaster/keymaster.b00
/system/vendor/firmware/keymaster/keymaster.b01
/system/vendor/firmware/keymaster/keymaster.b02
/system/vendor/firmware/keymaster/keymaster.b03
/system/vendor/firmware/keymaster/keymaster.mdt
/system/vendor/firmware/q6.b00
/system/vendor/firmware/q6.b01
/system/vendor/firmware/q6.b03
/system/vendor/firmware/q6.b04
/system/vendor/firmware/q6.b05
/system/vendor/firmware/q6.b06
/system/vendor/firmware/q6.mdt
/system/vendor/firmware/wcnss.b00
/system/vendor/firmware/wcnss.b01
/system/vendor/firmware/wcnss.b02
/system/vendor/firmware/wcnss.b04
/system/vendor/firmware/wcnss.b05
/system/vendor/firmware/wcnss.mdt
/system/vendor/lib/libdrmdecrypt.so
/system/vendor/lib/libgeofence.so
/system/vendor/lib/libizat_core.so
Expand Down
71 changes: 47 additions & 24 deletions self-extractors/extract-lists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,10 @@
;;
lge)
TO_EXTRACT="\
system/etc/DxHDCP.cfg \
system/lib/libAKM.so \
system/lib/libDxHdcp.so \
system/lib/libacdbdata.so \
system/lib/libAKM.so \
system/lib/libcamera_fast_af.so \
system/lib/libmorpho_noise_reduction.so \
system/vendor/firmware/discretix/dxhdcp2.b00 \
system/vendor/firmware/discretix/dxhdcp2.b01 \
system/vendor/firmware/discretix/dxhdcp2.b02 \
system/vendor/firmware/discretix/dxhdcp2.b03 \
system/vendor/firmware/discretix/dxhdcp2.mdt \
system/vendor/firmware/keymaster/keymaster.b00 \
system/vendor/firmware/keymaster/keymaster.b01 \
system/vendor/firmware/keymaster/keymaster.b02 \
Expand Down Expand Up @@ -55,27 +48,29 @@
system/etc/firmware/tzapps.b02 \
system/etc/firmware/tzapps.b03 \
system/etc/firmware/tzapps.mdt \
system/etc/firmware/vidc_1080p.fw \
system/etc/firmware/vidc.b00 \
system/etc/firmware/vidc.b01 \
system/etc/firmware/vidc.b02 \
system/etc/firmware/vidc.b03 \
system/etc/firmware/vidc.mdt \
system/etc/firmware/vidc_1080p.fw \
system/lib/egl/eglsubAndroid.so \
system/lib/egl/libEGL_adreno200.so \
system/lib/egl/libGLESv1_CM_adreno200.so \
system/lib/egl/libGLESv2_adreno200.so \
system/lib/egl/libq3dtools_adreno200.so \
system/lib/egl/libEGL_adreno.so \
system/lib/egl/libGLESv1_CM_adreno.so \
system/lib/egl/libGLESv2_adreno.so \
system/lib/egl/libplayback_adreno.so \
system/lib/egl/libq3dtools_adreno.so \
system/lib/hw/flp.msm8960.so \
system/lib/hw/gps.msm8960.so \
system/lib/hw/sensors.msm8960.so \
system/lib/libC2D2.so \
system/lib/libCommandSvc.so \
system/lib/libI420colorconvert.so \
system/lib/libQSEEComAPI.so \
system/lib/libacdbloader.so \
system/lib/libadreno_utils.so \
system/lib/libaudcal.so \
system/lib/libaudioalsa.so \
system/lib/libc2d2_a3xx.so \
system/lib/libC2D2.so \
system/lib/libc2d30-a3xx.so \
system/lib/libc2d30.so \
system/lib/libCB.so \
system/lib/libchromatix_imx111_default_video.so \
system/lib/libchromatix_imx111_preview.so \
system/lib/libchromatix_imx111_zsl.so \
Expand All @@ -95,6 +90,7 @@
system/lib/libchromatix_s5k4e1_preview.so \
system/lib/libchromatix_vx6953_default_video.so \
system/lib/libchromatix_vx6953_preview.so \
system/lib/libCommandSvc.so \
system/lib/libconfigdb.so \
system/lib/libcsd-client.so \
system/lib/libdiag.so \
Expand All @@ -107,47 +103,50 @@
system/lib/libdsucsd.so \
system/lib/libdsutils.so \
system/lib/libgemini.so \
system/lib/libgeofence.so \
system/lib/libgps.utils.so \
system/lib/libgsl.so \
system/lib/libI420colorconvert.so \
system/lib/libidl.so \
system/lib/libimage-jpeg-dec-omx-comp.so \
system/lib/libimage-jpeg-enc-omx-comp.so \
system/lib/libimage-omx-common.so \
system/lib/libllvm-a3xx.so \
system/lib/libloc_adapter.so \
system/lib/libloc_api_v02.so \
system/lib/libloc_core.so \
system/lib/libloc_eng.so \
system/lib/libmercury.so \
system/lib/libmm-color-convertor.so \
system/lib/libmmcamera_faceproc.so \
system/lib/libmmcamera_frameproc.so \
system/lib/libmmcamera_hdr_lib.so \
system/lib/libmmcamera_image_stab.so \
system/lib/libmmcamera_statsproc31.so \
system/lib/libmmcamera_wavelet_lib.so \
system/lib/libmm-color-convertor.so \
system/lib/libmmipl.so \
system/lib/libmmjpeg.so \
system/lib/libmmjps.so \
system/lib/libmmmpo.so \
system/lib/libmmmpod.so \
system/lib/libmmmpo.so \
system/lib/libmmstillomx.so \
system/lib/libnetmgr.so \
system/lib/liboemcamera.so \
system/lib/liboemcrypto.so \
system/lib/libqcci_legacy.so \
system/lib/libqdi.so \
system/lib/libqdp.so \
system/lib/libqmi.so \
system/lib/libqmi_cci.so \
system/lib/libqmi_client_qmux.so \
system/lib/libqmi_common_so.so \
system/lib/libqmi_csi.so \
system/lib/libqmi_csvt_srvc.so \
system/lib/libqmi_encdec.so \
system/lib/libqmiservices.so \
system/lib/libqmi.so \
system/lib/libQSEEComAPI.so \
system/lib/libril-qc-qmi-1.so \
system/lib/libril-qcril-hook-oem.so \
system/lib/librs_adreno_sha1.so \
system/lib/librs_adreno.so \
system/lib/libRSDriver_adreno.so \
system/lib/libsc-a3xx.so \
system/lib/libsensor1.so \
system/lib/libsensor_reg.so \
Expand All @@ -156,6 +155,30 @@
system/lib/libxml.so \
system/vendor/firmware/a300_pfp.fw \
system/vendor/firmware/a300_pm4.fw \
system/vendor/firmware/dsps.b00 \
system/vendor/firmware/dsps.b01 \
system/vendor/firmware/dsps.b02 \
system/vendor/firmware/dsps.b03 \
system/vendor/firmware/dsps.b04 \
system/vendor/firmware/dsps.b05 \
system/vendor/firmware/dsps.mdt \
system/vendor/firmware/q6.b00 \
system/vendor/firmware/q6.b01 \
system/vendor/firmware/q6.b03 \
system/vendor/firmware/q6.b04 \
system/vendor/firmware/q6.b05 \
system/vendor/firmware/q6.b06 \
system/vendor/firmware/q6.mdt \
system/vendor/firmware/wcnss.b00 \
system/vendor/firmware/wcnss.b01 \
system/vendor/firmware/wcnss.b02 \
system/vendor/firmware/wcnss.b04 \
system/vendor/firmware/wcnss.b05 \
system/vendor/firmware/wcnss.mdt \
system/vendor/lib/libdrmdecrypt.so \
system/vendor/lib/libgeofence.so \
system/vendor/lib/libizat_core.so \
system/vendor/lib/libloc_api_v02.so \
system/vendor/lib/libloc_ds_api.so \
"
;;
Loading