diff options
| -rw-r--r-- | BoardConfigCommon.mk | 1 | ||||
| -rw-r--r-- | bluetooth/bdroid_buildcfg.h | 1 | ||||
| -rw-r--r-- | bluetooth/vnd_generic.txt | 18 | ||||
| -rw-r--r-- | rootdir/init.camera.rc | 27 | ||||
| -rw-r--r-- | rootdir/init.qcom.rc | 111 | ||||
| -rw-r--r-- | sepolicy/workarounds.te | 4 | ||||
| -rw-r--r-- | shinano.mk | 3 | ||||
| -rw-r--r-- | system.prop | 3 |
8 files changed, 34 insertions, 134 deletions
diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index 17aae23..6a1a32d 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -42,6 +42,7 @@ BOARD_HAVE_BCM_FM := true BOARD_HAVE_BLUETOOTH := true BOARD_HAVE_BLUETOOTH_BCM := true BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/sony/shinano-common/bluetooth +BOARD_CUSTOM_BT_CONFIG := $(DEVICE_PATH)/bluetooth/vnd_generic.txt # CM Hardware BOARD_HARDWARE_CLASS += device/sony/shinano-common/cmhw diff --git a/bluetooth/bdroid_buildcfg.h b/bluetooth/bdroid_buildcfg.h index fdb1ed5..297c49a 100644 --- a/bluetooth/bdroid_buildcfg.h +++ b/bluetooth/bdroid_buildcfg.h @@ -21,6 +21,7 @@ #define BTA_DISABLE_DELAY 100 /* in milliseconds */ #define HCILP_INCLUDED FALSE #define BT_WAKE_VIA_USERIAL_IOCTL FALSE +#define BTM_WBS_INCLUDED TRUE /* Defined if the kernel does not have support for CLOCK_BOOTTIME_ALARM */ #define KERNEL_MISSING_CLOCK_BOOTTIME_ALARM TRUE diff --git a/bluetooth/vnd_generic.txt b/bluetooth/vnd_generic.txt new file mode 100644 index 0000000..31b1ff8 --- /dev/null +++ b/bluetooth/vnd_generic.txt @@ -0,0 +1,18 @@ +BLUETOOTH_UART_DEVICE_PORT = "/dev/ttyHS0" +FW_PATCHFILE_LOCATION = "/system/etc/firmware/" +FW_PATCHFILE_NAME = "BCM43xx.hcd" +BT_WAKE_VIA_USERIAL_IOCTL = TRUE +USERIAL_IOCTL_BT_WAKE_ASSERT = 0x5441 +USERIAL_IOCTL_BT_WAKE_DEASSERT = 0x5442 +USERIAL_IOCTL_BT_WAKE_GET_ST = 0x5443 +FW_PATCH_SETTLEMENT_DELAY_MS = 100 +UART_TARGET_BAUD_RATE = 3000000 +LPM_IDLE_TIMEOUT_MULTIPLE = 5 +LPM_BT_WAKE_POLARITY = 1 +LPM_HOST_WAKE_POLARITY = 1 +SCO_USE_I2S_INTERFACE = FALSE +SCO_I2SPCM_IF_ROLE = 0 +BTVND_DBG = FALSE +BTHW_DBG = TRUE +VNDUSERIAL_DBG = FALSE +UPIO_DBG = FALSE diff --git a/rootdir/init.camera.rc b/rootdir/init.camera.rc index 485da68..1d1acb3 100644 --- a/rootdir/init.camera.rc +++ b/rootdir/init.camera.rc @@ -131,16 +131,6 @@ service credmgrd /system/bin/credmgrd class main disabled -#doesn't exist on shinano. Keept for compat purpose -# Start Security Daemon -service secd /system/bin/secd - user system - group system - socket secd_ebl_sock stream 0660 system credmgr_client - socket secd_devsec_sock stream 0660 system credmgr_client - socket secd_credmgr_sock stream 0660 system credmgr_client - class main - # Secure Config Transfer service service sct_service /system/bin/sct_service user root @@ -157,13 +147,6 @@ service scd /system/bin/scd user system group system -service scdnotifier_nitz /system/bin/scdnotifier nitz - class main - user system - group system - oneshot - disabled - # All services that use qseecomd daemon listeners should # start on sys.listeners.registered property to make sure that # all of its service listeners are registered before calling them @@ -195,16 +178,6 @@ service tad_static /sbin/tad_static /dev/block/bootdevice/by-name/TA 0,16 socket tad stream 0770 system trimarea # tad_static is in rootfs, normal file_context does not work seclabel u:r:tad:s0 - -#service cameraserver /system/bin/logwrapper /system/bin/cameraserver -service cameraserver /system/bin/cameraserver - class main - user cameraserver - group camera drmrpc inet media mediadrm net_bt net_bt_admin net_bw_acct credmgr_client trimarea system audio -# group audio camera drmrpc inet media mediadrm net_bt net_bt_admin net_bw_acct credmgr_client - ioprio rt 4 -# seclabel u:r:cameraserver:s0 - writepid /dev/cpuset/foreground/tasks service updatemiscta /system/bin/updatemiscta class main diff --git a/rootdir/init.qcom.rc b/rootdir/init.qcom.rc index 78ba414..fbcd022 100644 --- a/rootdir/init.qcom.rc +++ b/rootdir/init.qcom.rc @@ -35,7 +35,6 @@ on init write /sys/bus/msm_subsys/devices/subsys3/restart_level "RELATED" # for backwards compatibility - symlink /sdcard /mnt/sdcard symlink /sdcard /storage/sdcard0 mkdir /tmp @@ -229,22 +228,6 @@ on boot write /proc/sys/net/ipv6/conf/rmnet5/accept_ra 2 write /proc/sys/net/ipv6/conf/rmnet6/accept_ra 2 write /proc/sys/net/ipv6/conf/rmnet7/accept_ra 2 - write /proc/sys/net/ipv6/conf/rmnet_sdio0/accept_ra 2 - write /proc/sys/net/ipv6/conf/rmnet_sdio1/accept_ra 2 - write /proc/sys/net/ipv6/conf/rmnet_sdio2/accept_ra 2 - write /proc/sys/net/ipv6/conf/rmnet_sdio3/accept_ra 2 - write /proc/sys/net/ipv6/conf/rmnet_sdio4/accept_ra 2 - write /proc/sys/net/ipv6/conf/rmnet_sdio5/accept_ra 2 - write /proc/sys/net/ipv6/conf/rmnet_sdio6/accept_ra 2 - write /proc/sys/net/ipv6/conf/rmnet_sdio7/accept_ra 2 - write /proc/sys/net/ipv6/conf/rmnet_usb0/accept_ra 2 - write /proc/sys/net/ipv6/conf/rmnet_usb1/accept_ra 2 - write /proc/sys/net/ipv6/conf/rmnet_usb2/accept_ra 2 - write /proc/sys/net/ipv6/conf/rmnet_usb3/accept_ra 2 - write /proc/sys/net/ipv6/conf/rmnet_usb0/accept_ra 2 - write /proc/sys/net/ipv6/conf/rmnet_usb1/accept_ra 2 - write /proc/sys/net/ipv6/conf/rmnet_usb2/accept_ra 2 - write /proc/sys/net/ipv6/conf/rmnet_usb3/accept_ra 2 # To prevent out of order acknowledgements from making # connection tracking to treat them as not belonging to @@ -279,11 +262,6 @@ on boot on post-fs #export LD_PRELOAD libNimsWrap.so - # MHL driver. To support MHL power off charge, - # the insmod must be done before chargemon. - insmod /system/lib/modules/mhl_sii8620_8061_drv.ko - - exec /system/bin/chargemon write /sys/class/power_supply/battery/shutdown_at_low_batt 1 # Change to socket location on libkeyctrl/suntory for /data encryption @@ -395,10 +373,6 @@ on post-fs-data setprop vold.post_fs_data_done 1 - # communicate with mpdecision and thermald - mkdir /dev/socket/mpdecision 0770 system system - chmod 2770 /dev/socket/mpdecision - # SONY: Create a dir on data partition not to be deleted during mr and wipedata mkdir /data/persist 0770 system system @@ -419,9 +393,6 @@ on post-fs-data restorecon_recursive /idd start wvkbd_installer -on property:init.svc.wpa_supplicant=stopped - stop dhcpcd - on property:bluetooth.isEnabled=true # start btwlancoex write /sys/class/bluetooth/hci0/idle_timeout 7000 @@ -444,12 +415,6 @@ on property:ro.radio.noril=true stop ril-daemon stop netmgrd -# start GNS/Sensor interface daemon -service gsiff_daemon /system/bin/gsiff_daemon - class late_start - user gps - group gps net_raw misc - service qseecomd /system/bin/qseecomd class core user root @@ -484,76 +449,28 @@ service wpa_supplicant /system/bin/wpa_supplicant \ disabled oneshot -service dhcpcd_wlan0 /system/bin/dhcpcd -aABDKL - class late_start - disabled - oneshot - -service dhcpcd_p2p /system/bin/dhcpcd -aABKL - class late_start - disabled - oneshot - -service iprenew_wlan0 /system/bin/dhcpcd -n - class late_start - disabled - oneshot - -service iprenew_p2p /system/bin/dhcpcd -n - class late_start - disabled - oneshot - -service dhcpcd_bnep0 /system/bin/dhcpcd -BKLG - disabled - oneshot - -service dhcpcd_bnep1 /system/bin/dhcpcd -BKLG - disabled - oneshot - -service dhcpcd_bnep2 /system/bin/dhcpcd -BKLG - disabled - oneshot - -service dhcpcd_bnep3 /system/bin/dhcpcd -BKLG - disabled - oneshot - -service dhcpcd_bnep4 /system/bin/dhcpcd -BKLG - disabled - oneshot - -service dhcpcd_bt-pan /system/bin/dhcpcd -BKLG - disabled - oneshot - -service iprenew_bt-pan /system/bin/dhcpcd -n - disabled - oneshot - on property:ro.data.large_tcp_window_size=true # Adjust socket buffer to enlarge TCP receive window for high bandwidth (e.g. DO-RevB) write /proc/sys/net/ipv4/tcp_adv_win_scale 2 -service mpdecision /system/bin/mpdecision --avg_comp - class main - user root - group system - disabled - service loc_launcher /system/bin/loc_launcher #loc_launcher will start as root and set its uid to gps class late_start group gps qcom_oncrpc inet net_raw qcom_diag net_admin wifi +service scdnotifier_nitz /system/bin/scdnotifier nitz + class main + user system + group system + oneshot + disabled + on property:gsm.nitz.time=* start scdnotifier_nitz on property:dev.bootcomplete=1 rm /data/system/perfd/default_values setprop sys.io.scheduler "row" - start mpdecision # Start suntrold service suntrold /system/bin/suntrold @@ -562,14 +479,6 @@ service suntrold /system/bin/suntrold oneshot class main -# bugreport is triggered by holding down volume down, volume up and power -service bugreport /system/bin/dumpstate -d -p -B \ - -o /data/data/com.android.shell/files/bugreports/bugreport - class main - disabled - oneshot - keycodes 114 115 116 - # Modem Log QMI service service mlog_qmi_service /system/bin/mlog_qmi_service user root @@ -657,12 +566,6 @@ service mediadrm /system/bin/mediadrmserver group bluetooth net_bt_admin net_bt seclabel u:r:uim:s0 -service ptt_socket_app /system/bin/ptt_socket_app - class main - user system - group system - oneshot - service imsqmidaemon /system/bin/imsqmidaemon class main user system diff --git a/sepolicy/workarounds.te b/sepolicy/workarounds.te index 7b0b6ab..686d5cb 100644 --- a/sepolicy/workarounds.te +++ b/sepolicy/workarounds.te @@ -21,8 +21,8 @@ allow thermanager sysfs_battery_supply:dir search; allow thermanager sysfs_battery_supply:file { open read write }; #============= scd ============== -allow scd scd_data:dir { getattr search }; -allow scd scd_data:file { getattr open read write }; +allow scd scd_data:dir { getattr search write add_name }; +allow scd scd_data:file { getattr open read write create }; allow scd socket_device:dir { add_name remove_name write }; allow scd socket_device:sock_file { create getattr setattr unlink write }; allow scd sysfs:file { getattr open read }; @@ -192,7 +192,8 @@ PRODUCT_PROPERTY_OVERRIDES += \ # HDMI PRODUCT_PROPERTY_OVERRIDES += \ - persist.demo.hdmirotationlock=false + persist.demo.hdmirotationlock=false \ + ro.hdmi.enable=true # Time PRODUCT_PROPERTY_OVERRIDES += \ diff --git a/system.prop b/system.prop index 1d93bfd..ae2b1bd 100644 --- a/system.prop +++ b/system.prop @@ -46,3 +46,6 @@ ro.semc.version.sw_type=user ro.semc.version.fs_revision=23.5.A.1.291 ro.semc.version.fs=GENERIC ro.semc.version.cust.active= + +# Storage +ro.sys.sdcardfs=true |