Merge commit 'da1600401a975bc2bebbd094ea75b797c46a6f60' into HEAD
Conflicts: rootdir/etc/init.qcom.rc Change-Id: Id4ec90dd8c9bc490d62761e498f05c8367b099c5
This commit is contained in:
commit
90e12261df
5
base.mk
5
base.mk
|
@ -22,13 +22,14 @@ QCOM_BOARD_PLATFORMS += msm8998
|
|||
QCOM_BOARD_PLATFORMS += apq8098_latv
|
||||
QCOM_BOARD_PLATFORMS += sdm660
|
||||
QCOM_BOARD_PLATFORMS += sdm845
|
||||
QCOM_BOARD_PLATFORMS += msmpeafowl
|
||||
|
||||
QSD8K_BOARD_PLATFORMS := qsd8k
|
||||
|
||||
TARGET_USE_VENDOR_CAMERA_EXT := true
|
||||
|
||||
#List of targets that use video hw
|
||||
MSM_VIDC_TARGET_LIST := msm8974 msm8610 msm8226 apq8084 msm8916 msm8994 msm8909 msm8992 msm8996 msm8952 msm8937 msm8953 msm8998 apq8098_latv sdm660 sdm845
|
||||
MSM_VIDC_TARGET_LIST := msm8974 msm8610 msm8226 apq8084 msm8916 msm8994 msm8909 msm8992 msm8996 msm8952 msm8937 msm8953 msm8998 apq8098_latv sdm660 sdm845 msmpeafowl
|
||||
|
||||
#List of targets that use master side content protection
|
||||
MASTER_SIDE_CP_TARGET_LIST := msm8996 msm8998 sdm660 sdm845 apq8098_latv
|
||||
|
@ -865,6 +866,8 @@ PRODUCT_PACKAGES += $(IMS_EXT)
|
|||
# Temp workarround for b/36603742
|
||||
PRODUCT_PACKAGES += android.hidl.manager@1.0-java
|
||||
|
||||
PRODUCT_PACKAGES += android.hardware.drm@1.0-impl
|
||||
|
||||
# Live Wallpapers
|
||||
PRODUCT_PACKAGES += \
|
||||
LiveWallpapers \
|
||||
|
|
|
@ -707,6 +707,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
|
|||
<boolean name="ims_call_type_enabled" value="true" />
|
||||
<boolean name="config_enable_conference_dialer" value="true" />
|
||||
<boolean name="config_conference_call_show_participant_status" value="true" />
|
||||
<boolean name="ignore_data_enabled_changed_for_video_calls" value="true"/>
|
||||
<boolean name="add_multi_participants_enabled" value="true" />
|
||||
<boolean name="add_participant_only_in_conference" value="true" />
|
||||
</carrier_config>
|
||||
|
@ -722,6 +723,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
|
|||
<string name="protocol">IPV4V6</string>
|
||||
<string name="roaming_protocol">IPV4V6</string>
|
||||
</map>
|
||||
<boolean name="ignore_data_enabled_changed_for_video_calls" value="true"/>
|
||||
</carrier_config>
|
||||
|
||||
<carrier_config mcc="460" mnc="02">
|
||||
|
@ -752,6 +754,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
|
|||
<boolean name="ims_call_type_enabled" value="true" />
|
||||
<boolean name="config_enable_conference_dialer" value="true" />
|
||||
<boolean name="config_conference_call_show_participant_status" value="true" />
|
||||
<boolean name="ignore_data_enabled_changed_for_video_calls" value="true"/>
|
||||
<boolean name="add_multi_participants_enabled" value="true" />
|
||||
<boolean name="add_participant_only_in_conference" value="true" />
|
||||
</carrier_config>
|
||||
|
@ -769,6 +772,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
|
|||
<string name="roaming_protocol">IPV4V6</string>
|
||||
</map>
|
||||
<boolean name="config_show_orig_dial_string_for_cdma" value="true" />
|
||||
<boolean name="ignore_data_enabled_changed_for_video_calls" value="true"/>
|
||||
</carrier_config>
|
||||
|
||||
<carrier_config mcc="460" mnc="04">
|
||||
|
@ -785,6 +789,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
|
|||
<string name="protocol">IPV4V6</string>
|
||||
<string name="roaming_protocol">IPV4V6</string>
|
||||
</map>
|
||||
<boolean name="ignore_data_enabled_changed_for_video_calls" value="true"/>
|
||||
</carrier_config>
|
||||
|
||||
<carrier_config mcc="460" mnc="06">
|
||||
|
@ -794,6 +799,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
|
|||
<string name="protocol">IPV4V6</string>
|
||||
<string name="roaming_protocol">IPV4V6</string>
|
||||
</map>
|
||||
<boolean name="ignore_data_enabled_changed_for_video_calls" value="true"/>
|
||||
</carrier_config>
|
||||
|
||||
<carrier_config mcc="460" mnc="07">
|
||||
|
@ -824,6 +830,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
|
|||
<boolean name="ims_call_type_enabled" value="true" />
|
||||
<boolean name="config_enable_conference_dialer" value="true" />
|
||||
<boolean name="config_conference_call_show_participant_status" value="true" />
|
||||
<boolean name="ignore_data_enabled_changed_for_video_calls" value="true"/>
|
||||
<boolean name="add_multi_participants_enabled" value="true" />
|
||||
<boolean name="add_participant_only_in_conference" value="true" />
|
||||
</carrier_config>
|
||||
|
@ -855,6 +862,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
|
|||
<boolean name="ims_call_type_enabled" value="true" />
|
||||
<boolean name="config_enable_conference_dialer" value="true" />
|
||||
<boolean name="config_conference_call_show_participant_status" value="true" />
|
||||
<boolean name="ignore_data_enabled_changed_for_video_calls" value="true"/>
|
||||
<boolean name="add_multi_participants_enabled" value="true" />
|
||||
<boolean name="add_participant_only_in_conference" value="true" />
|
||||
</carrier_config>
|
||||
|
@ -865,6 +873,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
|
|||
<string name="protocol">IPV4V6</string>
|
||||
<string name="roaming_protocol">IPV4V6</string>
|
||||
</map>
|
||||
<boolean name="ignore_data_enabled_changed_for_video_calls" value="true"/>
|
||||
</carrier_config>
|
||||
|
||||
<carrier_config mcc="460" mnc="10">
|
||||
|
@ -888,6 +897,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
|
|||
<string name="protocol">IPV4V6</string>
|
||||
<string name="roaming_protocol">IPV4V6</string>
|
||||
</map>
|
||||
<boolean name="ignore_data_enabled_changed_for_video_calls" value="true"/>
|
||||
</carrier_config>
|
||||
|
||||
<carrier_config mcc="460" mnc="12">
|
||||
|
@ -903,6 +913,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
|
|||
<string name="protocol">IPV4V6</string>
|
||||
<string name="roaming_protocol">IPV4V6</string>
|
||||
</map>
|
||||
<boolean name="ignore_data_enabled_changed_for_video_calls" value="true"/>
|
||||
</carrier_config>
|
||||
|
||||
<carrier_config mcc="310" mnc="030">
|
||||
|
|
|
@ -355,8 +355,8 @@ on property:sys.usb.ffs.ready=1 && property:sys.usb.config=diag,qdss,rmnet,adb &
|
|||
write /config/usb_gadget/g1/functions/qdss.qdss/enable_debug_inface 1
|
||||
symlink /config/usb_gadget/g1/functions/diag.diag /config/usb_gadget/g1/configs/b.1/f1
|
||||
symlink /config/usb_gadget/g1/functions/qdss.qdss /config/usb_gadget/g1/configs/b.1/f2
|
||||
symlink /config/usb_gadget/g1/functions/${sys.usb.rmnet.func.name}.rmnet /config/usb_gadget/g1/configs/b.1/f3
|
||||
symlink /config/usb_gadget/g1/functions/ffs.adb /config/usb_gadget/g1/configs/b.1/f4
|
||||
symlink /config/usb_gadget/g1/functions/ffs.adb /config/usb_gadget/g1/configs/b.1/f3
|
||||
symlink /config/usb_gadget/g1/functions/${sys.usb.rmnet.func.name}.rmnet /config/usb_gadget/g1/configs/b.1/f4
|
||||
write /config/usb_gadget/g1/UDC ${sys.usb.controller}
|
||||
setprop sys.usb.state ${sys.usb.config}
|
||||
|
||||
|
|
|
@ -136,6 +136,15 @@ else
|
|||
fi
|
||||
}
|
||||
|
||||
function start_hbtp()
|
||||
{
|
||||
# Start the Host based Touch processing but not in the power off mode.
|
||||
bootmode=`getprop ro.bootmode`
|
||||
if [ "charger" != $bootmode ]; then
|
||||
start hbtp
|
||||
fi
|
||||
}
|
||||
|
||||
case "$target" in
|
||||
"msm7201a_ffa" | "msm7201a_surf" | "msm7627_ffa" | "msm7627_6x" | "msm7627a" | "msm7627_surf" | \
|
||||
"qsd8250_surf" | "qsd8250_ffa" | "msm7630_surf" | "msm7630_1x" | "msm7630_fusion" | "qsd8650a_st1x")
|
||||
|
@ -473,14 +482,14 @@ case "$target" in
|
|||
"Surf")
|
||||
case "$platform_subtype_id" in
|
||||
"1")
|
||||
start hbtp
|
||||
start_hbtp
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
"MTP")
|
||||
case "$platform_subtype_id" in
|
||||
"3")
|
||||
start hbtp
|
||||
start_hbtp
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
|
@ -1131,7 +1140,7 @@ case "$target" in
|
|||
#1200p panel is connected to the device.
|
||||
dir="/sys/bus/i2c/devices/3-0038"
|
||||
if [ ! -d "$dir" ]; then
|
||||
start hbtp
|
||||
start_hbtp
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
|
@ -1343,7 +1352,7 @@ case "$target" in
|
|||
# Start Host based Touch processing
|
||||
case "$hw_platform" in
|
||||
"MTP" | "Surf" | "RCM" )
|
||||
start hbtp
|
||||
start_hbtp
|
||||
;;
|
||||
esac
|
||||
# Apply Scheduler and Governor settings for 8917 / 8920
|
||||
|
@ -1456,7 +1465,7 @@ case "$target" in
|
|||
# Start Host based Touch processing
|
||||
case "$hw_platform" in
|
||||
"MTP" | "Surf" | "RCM" )
|
||||
start hbtp
|
||||
start_hbtp
|
||||
;;
|
||||
esac
|
||||
|
||||
|
@ -1766,7 +1775,7 @@ case "$target" in
|
|||
# Start Host based Touch processing
|
||||
case "$hw_platform" in
|
||||
"MTP" | "Surf" | "RCM" | "QRD" )
|
||||
start hbtp
|
||||
start_hbtp
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
|
@ -1778,7 +1787,7 @@ case "$target" in
|
|||
# Start Host based Touch processing
|
||||
case "$hw_platform" in
|
||||
"MTP" | "Surf" | "RCM" | "QRD" )
|
||||
start hbtp
|
||||
start_hbtp
|
||||
;;
|
||||
esac
|
||||
|
||||
|
@ -2345,7 +2354,7 @@ case "$target" in
|
|||
|
||||
case "$soc_id" in
|
||||
"321") #sdm845
|
||||
start hbtp
|
||||
start_hbtp
|
||||
;;
|
||||
esac
|
||||
# Core control parameters
|
||||
|
@ -2532,6 +2541,10 @@ case "$target" in
|
|||
platform_major_version=$((10#${platform_version}>>16))
|
||||
fi
|
||||
|
||||
if [ -f /sys/devices/soc0/platform_subtype_id ]; then
|
||||
platform_subtype_id=`cat /sys/devices/soc0/platform_subtype_id`
|
||||
fi
|
||||
|
||||
case "$soc_id" in
|
||||
"292") #msm8998 apq8098_latv
|
||||
# Start Host based Touch processing
|
||||
|
@ -2539,11 +2552,11 @@ case "$target" in
|
|||
"QRD")
|
||||
case "$platform_subtype_id" in
|
||||
"0")
|
||||
start hbtp
|
||||
start_hbtp
|
||||
;;
|
||||
"16")
|
||||
if [ $platform_major_version -lt 6 ]; then
|
||||
start hbtp
|
||||
start_hbtp
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
|
|
|
@ -71,6 +71,10 @@ on boot
|
|||
chown bluetooth bluetooth /sys/module/hci_uart/parameters/ath_btwrite
|
||||
chown system system /sys/module/sco/parameters/disable_esco
|
||||
chown bluetooth bluetooth /sys/module/hci_smd/parameters/hcismd_set
|
||||
chown system system /sys/module/msm_core/parameters/polling_interval
|
||||
chown system system /sys/module/msm_core/parameters/disabled
|
||||
chown system system /sys/kernel/debug/msm_core/enable
|
||||
chown system system /sys/kernel/debug/msm_core/ptable
|
||||
chown system system /sys/module/radio_iris_transport/parameters/fmsmd_set
|
||||
chmod 0660 /sys/module/bluetooth_power/parameters/power
|
||||
chmod 0660 /sys/module/hci_smd/parameters/hcismd_set
|
||||
|
@ -1042,6 +1046,8 @@ service seemp_healthd /system/vendor/bin/seemp_healthd
|
|||
|
||||
on charger
|
||||
setprop persist.sys.usb.config charging
|
||||
load_system_props
|
||||
start qcom-post-boot
|
||||
|
||||
#add poweroffhandler
|
||||
service poweroffhandler /system/vendor/bin/poweroffhandler
|
||||
|
|
|
@ -26,9 +26,30 @@
|
|||
#
|
||||
|
||||
on charger
|
||||
mkdir /dev/usb-ffs 0770 shell shell
|
||||
mkdir /dev/usb-ffs/adb 0770 shell shell
|
||||
mount configfs none /config
|
||||
mkdir /config/usb_gadget/g1 0770 shell shell
|
||||
mkdir /config/usb_gadget/g1/strings/0x409 0770 shell shell
|
||||
write /config/usb_gadget/g1/bcdUSB 0x0200
|
||||
write /config/usb_gadget/g1/os_desc/use 1
|
||||
write /config/usb_gadget/g1/strings/0x409/serialnumber ${ro.serialno}
|
||||
write /config/usb_gadget/g1/strings/0x409/manufacturer ${ro.product.manufacturer}
|
||||
write /config/usb_gadget/g1/strings/0x409/product ${ro.product.model}
|
||||
mkdir /config/usb_gadget/g1/functions/mass_storage.0
|
||||
mkdir /config/usb_gadget/g1/functions/ffs.adb
|
||||
mkdir /config/usb_gadget/g1/configs/b.1 0770 shell shell
|
||||
mkdir /config/usb_gadget/g1/configs/b.1/strings/0x409 0770 shell shell
|
||||
write /config/usb_gadget/g1/os_desc/b_vendor_code 0x1
|
||||
symlink /config/usb_gadget/g1/configs/b.1 /config/usb_gadget/g1/os_desc/b.1
|
||||
mount functionfs adb /dev/usb-ffs/adb uid=2000,gid=2000
|
||||
write /sys/class/android_usb/android0/f_ffs/aliases adb
|
||||
enable qcom-usb-sh
|
||||
start qcom-usb-sh
|
||||
setprop sys.usb.config mass_storage
|
||||
|
||||
on boot
|
||||
write /sys/class/android_usb/android0/iSerial ${ro.serialno}
|
||||
mkdir /dev/usb-ffs 0770 shell shell
|
||||
mkdir /dev/usb-ffs/adb 0770 shell shell
|
||||
mount configfs none /config
|
||||
|
|
|
@ -57,6 +57,9 @@
|
|||
/dev/smd3 0660 bluetooth bluetooth
|
||||
/dev/btpower 0660 bluetooth system
|
||||
|
||||
#permissions for pta
|
||||
/dev/pta 0660 system system
|
||||
|
||||
/dev/radio0 0640 system system
|
||||
/dev/rfcomm0 0660 bluetooth bluetooth
|
||||
/dev/ttyUSB0 0660 bluetooth bluetooth
|
||||
|
|
|
@ -54,3 +54,4 @@ add_lunch_combo sdm660_64-userdebug
|
|||
add_lunch_combo sdm660_32-userdebug
|
||||
add_lunch_combo sdm845-userdebug
|
||||
add_lunch_combo apq8098_latv-userdebug
|
||||
add_lunch_combo msmpeafowl-userdebug
|
||||
|
|
Loading…
Reference in New Issue