sdm660-common: Move all props to properties.mk

* Also add more, drop unused props

Change-Id: I4cf605b6f6a5e5fcf05e84ceb30497bb7a29cfab

4 files changed, 52 insertions, 202 deletions

diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 2367655..ff016e3 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -182,7 +182,6 @@ TARGET_USES_INTERACTION_BOOST := true
 
 # Properties
 BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true
-TARGET_SYSTEM_PROP += $(COMMON_PATH)/system.prop
 
 # Recovery
 BOARD_HAS_LARGE_FILESYSTEM := true
diff --git a/properties.mk b/properties.mk
index 24231cb..f9bf982 100644
--- a/properties.mk
+++ b/properties.mk
@@ -87,14 +87,43 @@ PRODUCT_PROPERTY_OVERRIDES += \
 PRODUCT_PROPERTY_OVERRIDES += \
     vendor.qcom.bluetooth.soc=cherokee
 
+PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
+    vendor.bluetooth.soc=cherokee
+
+# Camera
+PRODUCT_PROPERTY_OVERRIDES += \
+    persist.vendor.camera.preview.ubwc=0 \
+    vendor.video.disable.ubwc=1 \
+    vidc.enc.dcvs.extra-buff-count=2
+
+# CNE
+PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
+    persist.vendor.cne.feature=1
+
 # Display
 PRODUCT_PROPERTY_OVERRIDES += \
+    debug.sf.enable_hwc_vds=1 \
+    debug.sf.hw=1 \
+    debug.sf.latch_unsignaled=1 \
     ro.opengles.version=196610 \
-    vendor.video.disable.ubwc=1
+    ro.vendor.display.cabl=0 \
+    vendor.display.disable_skip_validate=1 \
+    vendor.display.enable_default_color_mode=1 \
+    vendor.gralloc.enable_fb_ubwc=1
 
 # FRP
 PRODUCT_PROPERTY_OVERRIDES += \
-    ro.frp.pst=/dev/block/bootdevice/by-name/frp \
+    ro.frp.pst=/dev/block/bootdevice/by-name/frp
+
+# Media
+PRODUCT_PROPERTY_OVERRIDES += \
+    media.stagefright.thumbnail.prefer_hw_codecs=true \
+    vendor.vidc.dec.enable.downscalar=1 \
+    vendor.vidc.enc.disable_bframes=1
+
+# Netflix
+PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
+    ro.netflix.bsp_rev=Q660-13149-1
 
 # Perf
 PRODUCT_PROPERTY_OVERRIDES += \
@@ -103,17 +132,35 @@ PRODUCT_PROPERTY_OVERRIDES += \
 # Radio
 PRODUCT_PROPERTY_OVERRIDES += \
     persist.radio.multisim.config=dsds \
+    persist.vendor.data.mode=concurrent \
     persist.vendor.radio.apm_sim_not_pwdn=1 \
+    persist.vendor.radio.atfwd.start=true \
     persist.vendor.radio.custom_ecc=1 \
     persist.vendor.radio.rat_on=combine \
-    persist.vendor.radio.sib16_support=1
+    persist.vendor.radio.sib16_support=1 \
+    ro.telephony.default_network=22,22 \
+    ro.vendor.use_data_netmgrd=true
+
+PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
+    DEVICE_PROVISIONED=1 \
+    persist.sys.fflag.override.settings_network_and_internet_v2=true \
+    ril.subscription.types=NV,RUIM \
+    telephony.lteOnCdmaDevice=1
 
 # Sensor
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.vendor.sdk.sensors.gestures=false \
     ro.vendor.sensors.cmc=false \
-    ro.vendor.sensors.facing=false
+    ro.vendor.sensors.facing=false \
+    ro.vendor.sensors.dev_ori=true \
+    ro.vendor.sensors.pmd=true \
+    ro.vendor.sensors.sta_detect=true \
+    ro.vendor.sensors.mot_detect=true
 
 # Time
 PRODUCT_PROPERTY_OVERRIDES += \
     persist.vendor.delta_time.enable=true
+
+# WFD
+PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
+    persist.debug.wfd.enable=1
diff --git a/sepolicy/vendor/property_contexts b/sepolicy/vendor/property_contexts
index 6d83f88..58c4ebe 100644
--- a/sepolicy/vendor/property_contexts
+++ b/sepolicy/vendor/property_contexts
@@ -12,6 +12,7 @@ disable.cpp.power.collapse              u:object_r:vendor_default_prop:s0
 persist.camera.                         u:object_r:vendor_default_prop:s0
 persist.vendor.camera.                  u:object_r:camera_prop:s0
 vendor.camera.eis.gyro_name             u:object_r:camera_prop:s0
+vidc.enc.dcvs.extra-buff-count          u:object_r:vendor_default_prop:s0
 
 # Fingerprint
 fpc_kpi                                 u:object_r:vendor_default_prop:s0
diff --git a/system.prop b/system.prop
deleted file mode 100644
index c2e657d..0000000
--- a/system.prop
+++ /dev/null
@@ -1,197 +0,0 @@
-#
-# system.prop for sdm660
-#
-
-#rild.libpath=/system/lib/libreference-ril.so
-rild.libpath=/system/vendor/lib64/libril-qc-qmi-1.so
-#rild.libargs=-d /dev/smd0
-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
-persist.sys.fflag.override.settings_network_and_internet_v2=true
-
-#
-# Set network mode to (T/L/G/W/1X/EVDO, T/G/W/L) for 7+7 mode device on DSDS mode
-#
-ro.telephony.default_network=22,22
-
-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
-#Disable Skip Validate
-sdm.debug.disable_skip_validate=1
-
-#Property to enable display default color mode
-vendor.display.enable_default_color_mode=1
-
-# Display Properties as per treble compliance
-vendor.gralloc.enable_fb_ubwc=1
-vendor.display.disable_skip_validate=1
-
-#ro.hdmi.enable=true
-#
-# system props for the cne module
-#
-persist.vendor.cne.feature=1
-
-#system props for the MM modules
-media.stagefright.enable-player=true
-media.stagefright.enable-http=true
-media.stagefright.enable-aac=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
-#vendor.mm.enable.qcom_parser=13631487
-persist.mm.enable.prefetch=true
-
-#prefer HW codec over SW for thumbnail
-media.stagefright.thumbnail.prefer_hw_codecs=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
-vidc.enc.dcvs.extra-buff-count=2
-
-#Netflix custom property
-ro.netflix.bsp_rev=Q660-13149-1
-
-#
-# system props for the data modules
-#
-ro.vendor.use_data_netmgrd=true
-persist.vendor.data.mode=concurrent
-#system props for time-services
-persist.timed.enable=true
-
-# system property for maximum number of HFP client connections
-bt.max.hfpclient.connections=1
-#force disable Bluetooth AAC by default
-persist.bt.a2dp.aac_disable=true
-
-# System property for cabl
-ro.qualcomm.cabl=0
-ro.vendor.display.cabl=0
-
-#
-# 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
-#
-
-#minimum duration for offload playback in secs
-audio.offload.min.duration.secs=30
-
-#enable offload audio video playback by default
-audio.offload.video=true
-
-#enable music through deep buffer
-audio.deep_buffer.media=true
-
-#set AudioFlinger client heap size
-ro.af.client_heap_size_kbyte=7168
-
-#system prop for RmNet Data
-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.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
-
-# system prop for NFC DT
-ro.nfc.port=I2C
-
-#hwui properties
-ro.hwui.texture_cache_size=72
-ro.hwui.layer_cache_size=48
-ro.hwui.r_buffer_cache_size=8
-ro.hwui.path_cache_size=32
-ro.hwui.gradient_cache_size=1
-ro.hwui.drop_shadow_cache_size=6
-ro.hwui.texture_cache_flushrate=0.4
-ro.hwui.text_small_cache_width=1024
-ro.hwui.text_small_cache_height=1024
-ro.hwui.text_large_cache_width=2048
-ro.hwui.text_large_cache_height=2048
-
-#Bringup properties
-persist.vendor.radio.atfwd.start=true
-
-#property to enable VDS WFD solution
-persist.hwc.enable_vds=1
-
-#Settings to enable sensors
-#Device Orientation sensor
-ro.vendor.sensors.dev_ori=true
-#Persistent Motion Detector
-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
-vendor.camera.aux.packagelist=org.codeaurora.snapcam
-
-#Whitelisting the below packages
-persist.vendor.camera.privapp.list=org.codeaurora.snapcam
-persist.camera.privapp.list=org.codeaurora.snapcam
-
-#disable UBWC for camera
-persist.vendor.camera.preview.ubwc=0
-
-#set maximum supported adapter voltage
-persist.chg.max_volt_mv=9000
-
-#system prop for Bluetooth SOC type
-vendor.bluetooth.soc=cherokee
-#ro.bluetooth.library_name=libbluetooth_qti.so
-persist.vendor.btstack.enable.splita2dp=true
-persist.vendor.btstack.a2dp_offload_cap=sbc-aptx-aptxhd-aac
-
-# Property for backup NTP Server
-persist.backup.ntpServer="0.pool.ntp.org"
-# enable IZat OptInApp overlay
-persist.vendor.overlay.izat.optin=rro