wayne: Cleanup properties

 * Remove unused properties
 * Rearrange props
 * Use fluence audio

Signed-off-by: Isaac Chen <isaacchen@isaacchen.cn>

2 files changed, 96 insertions, 239 deletions

diff --git a/device.mk b/device.mk
index f691c5c..8a2d290 100644
--- a/device.mk
+++ b/device.mk
@@ -444,7 +444,3 @@ PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/wifi/p2p_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant_overlay.conf \
     $(LOCAL_PATH)/wifi/wpa_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant_overlay.conf \
     $(LOCAL_PATH)/wifi/WCNSS_qcom_cfg.ini:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/WCNSS_qcom_cfg.ini
-
-# Density
-PRODUCT_PROPERTY_OVERRIDES += \
-    ro.sf.lcd_density=440
diff --git a/vendor.prop b/vendor.prop
index 839a37a..f78237f 100644
--- a/vendor.prop
+++ b/vendor.prop
@@ -1,279 +1,140 @@
-persist.sys.whetstone.level=2
-video.disable.ubwc=1
-persist.vendor.qcomsysd.enabled=1
-ro.vendor.extension_library=libqti-perfd-client.so
-persist.radio.apm_sim_not_pwdn=1
-persist.vendor.radio.sib16_support=1
-persist.vendor.radio.custom_ecc=1
-persist.vendor.radio.rat_on=combine
-persist.radio.schd.cache=3500
-ro.frp.pst=/dev/block/bootdevice/by-name/frp
-ro.opengles.version=196610
-qcom.bluetooth.soc=cherokee
+# Audio
 af.fast_track_multiplier=1
-vendor.audio_hal.period_size=192
-ro.vendor.audio.sdk.fluencetype=none
+audio.adm.buffering.ms=6
+audio.deep_buffer.media=true
+audio.offload.min.duration.secs=30
+audio.offload.video=true
+persist.dirac.acs.controller=qem
+persist.dirac.acs.ignore_error=1
+persist.dirac.acs.storeSettings=1
+persist.vendor.audio.fluence.speaker=true
 persist.vendor.audio.fluence.voicecall=true
 persist.vendor.audio.fluence.voicerec=false
-persist.vendor.audio.fluence.speaker=true
-vendor.audio.tunnel.encode=false
+persist.vendor.audio.hifi.int_codec=true
 persist.vendor.audio.ras.enabled=false
-vendor.audio.offload.buffer.size.kb=64
-audio.offload.min.duration.secs=30
-audio.offload.video=true
-vendor.audio.offload.track.enable=false
-audio.deep_buffer.media=true
-vendor.voice.path.for.pcm.voip=true
-vendor.audio.offload.multiaac.enable=true
+persist.vendor.bt.a2dp_offload_cap=sbc-aac
+ro.audio.soundfx.dirac=true
+ro.vendor.audio.sdk.fluencetype=fluence
+ro.vendor.audio.sdk.ssr=false
 vendor.audio.dolby.ds2.enabled=false
 vendor.audio.dolby.ds2.hardbypass=false
+vendor.audio.flac.sw.decoder.24bit=true
+vendor.audio.hw.aac.encoder=true
+vendor.audio.noisy.broadcast.delay=600
+vendor.audio.offload.buffer.size.kb=64
+vendor.audio.offload.gapless.enabled=true
+vendor.audio.offload.multiaac.enable=true
 vendor.audio.offload.multiple.enabled=false
 vendor.audio.offload.passthrough=false
-ro.vendor.audio.sdk.ssr=false
-vendor.audio.offload.gapless.enabled=true
-vendor.audio.safx.pbe.enabled=true
+vendor.audio.offload.pstimeout.secs=3
+vendor.audio.offload.track.enable=false
 vendor.audio.parser.ip.buffer.size=262144
-vendor.audio.flac.sw.decoder.24bit=true
-persist.vendor.bt.a2dp_offload_cap=sbc-aac
+vendor.audio.safx.pbe.enabled=true
+vendor.audio.tunnel.encode=false
 vendor.audio.use.sw.alac.decoder=true
 vendor.audio.use.sw.ape.decoder=true
-vendor.audio.hw.aac.encoder=true
+vendor.audio_hal.period_size=192
 vendor.fm.a2dp.conc.disabled=true
-vendor.audio.noisy.broadcast.delay=600
-persist.vendor.audio.hifi.int_codec=true
-vendor.audio.offload.pstimeout.secs=3
-audio.adm.buffering.ms=6
-ro.vendor.sensors.facing=false
-ro.vendor.sensors.cmc=false
-ro.vendor.sdk.sensors.gestures=false
-sys.haptic.down.weak=9,11
-sys.haptic.down.normal=5,15
-sys.haptic.down.strong=0,20
-ro.build.version.internal=
-ro.build.version.external=
-ro.build.version.bsp=0.0.1_180426
-ro.build.hardware.version=D7s-1
-#
-# system.prop for sdm660
-#
+vendor.voice.path.for.pcm.voip=true
 
-rild.libpath=/system/vendor/lib64/libril-qc-qmi-1.so
-persist.rild.nitz_plmn=
-persist.rild.nitz_long_ons_0=
-persist.rild.nitz_long_ons_1=
-persist.rild.nitz_long_ons_2=
-persist.rild.nitz_long_ons_3=
-persist.rild.nitz_short_ons_0=
-persist.rild.nitz_short_ons_1=
-persist.rild.nitz_short_ons_2=
-persist.rild.nitz_short_ons_3=
-ril.subscription.types=NV,RUIM
-DEVICE_PROVISIONED=1
+# Bluetooth
+qcom.bluetooth.soc=cherokee
 
-#
-# Set network mode to (T/L/G/W/1X/EVDO, T/G/W/L) for 7+5 mode device on DSDS mode
-#
-ro.telephony.default_network=22,20
-persist.radio.multisim.config=dsds
+# Camera
+persist.bokeh.switch.lux=290
+persist.camera.depth.focus.cb=0
+persist.camera.expose.aux=1
+persist.camera.isp.clock.optmz=0
+persist.camera.isp.turbo=1
+persist.camera.linkpreview=0
+persist.camera.preview.ubwc=0
+persist.camera.set.afd=4
+persist.camera.stats.test=0
+persist.imx376_ofilm.light.lux=280
+persist.imx376_ofilm.low.lux=310
+persist.imx376_sunny.light.lux=280
+persist.imx376_sunny.low.lux=310
+vendor.camera.aux.packagelist=org.codeaurora.snapcam,com.android.camera,com.qualcomm.qti.qmmi
+video.disable.ubwc=1
 
+# Display
+debug.gralloc.enable_fb_ubwc=1
 debug.sf.enable_hwc_vds=1
 debug.sf.hw=1
 debug.sf.latch_unsignaled=1
-debug.gralloc.enable_fb_ubwc=1
-dalvik.vm.heapsize=36m
-dev.pm.dyn_samplingrate=1
-persist.demo.hdmirotationlock=false
-
-#ro.hdmi.enable=true
-#
-# system props for the cne module
-#
-persist.cne.feature=1
+persist.debug.wfd.enable=1
+persist.hwc.enable_vds=1
+ro.opengles.version=196610
+ro.qualcomm.cabl=0
+ro.sf.lcd_density=440
+sdm.debug.disable_skip_validate=1
 
-# # system props for the dpm module
-persist.dpm.feature=1
-#
+# GPS
+persist.vendor.overlay.izat.optin=rro
 
-#system props for the MM modules
-media.stagefright.enable-player=true
-media.stagefright.enable-http=true
+# Media
+media.aac_51_output_enabled=true
 media.stagefright.enable-aac=true
+media.stagefright.enable-http=true
+media.stagefright.enable-player=true
 media.stagefright.enable-qcp=true
 media.stagefright.enable-scan=true
-mmp.enable.3g2=true
-media.aac_51_output_enabled=true
-mm.enable.smoothstreaming=true
-media.settings.xml=/vendor/etc/media_profiles_vendor.xml
-#codecs:(PARSER_)AAC AC3 AMR_NB AMR_WB ASF AVI DTS FLV 3GP 3G2 MKV MP2PS MP2TS MP3 OGG QCP WAV FLAC AIFF APE DSD
 mm.enable.qcom_parser=13631471
+mm.enable.smoothstreaming=true
+mmp.enable.3g2=true
 persist.mm.enable.prefetch=true
-
-#property to enable narrow search range for video encoding
-vidc.enc.target_support_bframe=1
-vendor.vidc.enc.disable_bframes=1
 vendor.vidc.dec.enable.downscalar=1
-
-# enable PQ feature by default
 vendor.vidc.enc.disable.pq=false
-
-# Additional buffers shared between Camera and Video
+vendor.vidc.enc.disable_bframes=1
 vidc.enc.dcvs.extra-buff-count=2
+vidc.enc.target_support_bframe=1
 
-#Netflix custom property
-ro.netflix.bsp_rev=Q660-13149-1
-
-#
-# system props for the data modules
-#
-ro.use_data_netmgrd=true
-persist.data.netmgrd.qos.enable=true
-persist.data.mode=concurrent
-#system props for time-services
+# QCOM
+persist.cne.feature=1
+persist.dpm.feature=1
 persist.timed.enable=true
+persist.vendor.qcomsysd.enabled=1
+ro.vendor.at_library=libqti-at.so
+ro.vendor.extension_library=libqti-perfd-client.so
 
-# system property for maximum number of HFP client connections
-bt.max.hfpclient.connections=1
-
-# System property for cabl
-ro.qualcomm.cabl=0
-
-# add for ad
-ro.qcom.ad=1
-#ro.qcom.ad.calib.data=/vendor/etc/calib.cfg
-ro.qcom.ad.calib.data=/system/etc/calib.cfg
-ro.qcom.ad.sensortype=2
-
-#
-# System props for telephony
-# System prop to turn on CdmaLTEPhone always
-telephony.lteOnCdmaDevice=1
-
-#Simulate sdcard on /data/media
-#
-persist.fuse_sdcard=true
-
-#system prop for wipower support
-ro.bluetooth.emb_wp_mode=true
-ro.bluetooth.wipower=true
-
-#
-#snapdragon value add features
-#
-
-#system prop for RmNet Data
-persist.rmnet.data.enable=true
-persist.data.wda.enable=true
-persist.data.df.dl_mode=5
-persist.data.df.ul_mode=5
+# Radio
+DEVICE_PROVISIONED=1
 persist.data.df.agg.dl_pkt=10
 persist.data.df.agg.dl_size=4096
-persist.data.df.mux_count=8
-persist.data.df.iwlan_mux=9
 persist.data.df.dev_name=rmnet_usb0
-
-#
-# system property determining camera HAL to be used for a Video call
-#
-# 1 is camera1
-# 2 or anything else is camera2
+persist.data.df.dl_mode=5
+persist.data.df.iwlan_mux=9
+persist.data.df.mux_count=8
+persist.data.df.ul_mode=5
+persist.data.mode=concurrent
+persist.data.netmgrd.qos.enable=true
+persist.data.wda.enable=true
 persist.radio.VT_CAM_INTERFACE=2
-
-#property to enable user to access Google WFD settings
-persist.debug.wfd.enable=1
-#Enable stm-events
-persist.debug.coresight.config=stm-events
-##property to choose between virtual/external wfd display
-persist.sys.wfd.virtual=0
-
-#property for vendor specific library
-ro.vendor.at_library=libqti-at.so
-
-#min/max cpu in core control
-ro.vendor.qti.core_ctl_min_cpu=2
-ro.vendor.qti.core_ctl_max_cpu=4
-
-#Bringup properties
 persist.radio.atfwd.start=true
+persist.radio.multisim.config=dsds
+persist.rmnet.data.enable=true
+persist.vendor.qti.telephony.vt_cam_interface=1
+ril.subscription.types=NV,RUIM
+rild.libpath=/system/vendor/lib64/libril-qc-qmi-1.so
+ro.telephony.default_network=22,20
+ro.use_data_netmgrd=true
+telephony.lteOnCdmaDevice=1
 
-#property to enable VDS WFD solution
-persist.hwc.enable_vds=1
-
-#Increase cached app limit
-#ro.vendor.qti.sys.fw.bg_apps_limit=60
-
-#Settings to enable sensors
-#Device Orientation sensor
+# Sensor
+persist.radio.apm_sim_not_pwdn=1
+persist.radio.schd.cache=3500
+persist.vendor.radio.custom_ecc=1
+persist.vendor.radio.rat_on=combine
+persist.vendor.radio.sib16_support=1
+ro.vendor.sdk.sensors.gestures=false
+ro.vendor.sensors.cmc=false
 ro.vendor.sensors.dev_ori=false
-#Persistent Motion Detector
+ro.vendor.sensors.facing=false
+ro.vendor.sensors.mot_detect=true
 ro.vendor.sensors.pmd=true
-#Stationary Detector
 ro.vendor.sensors.sta_detect=true
-#Motion Detector
-ro.vendor.sensors.mot_detect=true
-
-#Expose aux camera for below packages
-camera.aux.packagelist=org.codeaurora.snapcam,com.android.camera,com.qualcomm.qti.qmmi
-vendor.camera.aux.packagelist=org.codeaurora.snapcam,com.android.camera,com.qualcomm.qti.qmmi
-#disable UBWC for camera
-persist.camera.preview.ubwc=0
-persist.camera.stats.test=0
-persist.camera.depth.focus.cb=0
-persist.camera.isp.clock.optmz=0
-persist.camera.linkpreview=0
-persist.camera.isp.turbo=1
-persist.camera.set.afd=4
-
-#exif info for camera
-persist.sys.exif.make=Xiaomi
-persist.sys.exif.model=MI 6X
-
-#properties for camera front flash lux
-persist.imx376_sunny.low.lux=310
-persist.imx376_sunny.light.lux=280
-
-persist.imx376_ofilm.low.lux=310
-persist.imx376_ofilm.light.lux=280
-
-#properties for bokeh switch master and slave lux
-persist.bokeh.switch.lux=290
-
-#enable aux and dual-cam
-persist.camera.expose.aux=1
-
-#set maximum supported adapter voltage
-persist.chg.max_volt_mv=9000
-
-#add for dirac algo tsx 9/12
-persist.dirac.acs.controller=qem
-persist.dirac.acs.storeSettings=1
-persist.dirac.acs.ignore_error=1
-
-#set for xiaomi headset effect
-ro.audio.soundfx.dirac=true
-
-#Property to enable display default color mode
-vendor.display.enable_default_color_mode=1
-
-# Property for backup NTP Server
-persist.backup.ntpServer="0.pool.ntp.org"
-# enable IZat OptInApp overlay
-persist.vendor.overlay.izat.optin=rro
-#Disable Skip Validate
-sdm.debug.disable_skip_validate=1
-
-#paper mode
-sys.paper_mode_max_level=32
-sys.tianma_nt36672_offset=12
-sys.tianma_nt36672_length=46
-sys.jdi_nt36672_offset=9
-sys.jdi_nt36672_length=45
-
-#system property determining camera to be used for a Video call
-persist.vendor.qti.telephony.vt_cam_interface=1
 
-# enable new autobrightness algo
-sys.autobrightness_optimize=true
-#enable all system restart_level to relative
+# Subsystem Restart
 persist.sys.ssr.restart_level=ALL_ENABLE
 
 # Vendor Security Patch Level