diff options
| -rw-r--r-- | BoardConfigCommon.mk | 1 | ||||
| -rw-r--r-- | config.fs | 3 | ||||
| -rwxr-xr-x | extract-files.sh | 7 | ||||
| -rw-r--r-- | manifest.xml | 54 | ||||
| -rwxr-xr-x | msm8996.mk | 5 | ||||
| -rw-r--r-- | rootdir/etc/init.qcom.rc | 37 | ||||
| -rw-r--r-- | vendor_prop.mk | 5 |
7 files changed, 50 insertions, 62 deletions
diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index 2a6ffb3..0d2ae52 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -142,6 +142,7 @@ TARGET_USERIMAGES_USE_F2FS := true # RIL TARGET_USES_OLD_MNC_FORMAT := true +ENABLE_VENDOR_RIL_SERVICE := true # Security patch level VENDOR_SECURITY_PATCH := 2018-11-05 @@ -13,6 +13,9 @@ value:2904 [AID_VENDOR_ADPL_ODL] value:2905 +[AID_VENDOR_QRTR] +value:2906 + [vendor/bin/pm-service] mode: 0755 user: AID_SYSTEM diff --git a/extract-files.sh b/extract-files.sh index cf9272c..f7be1e9 100755 --- a/extract-files.sh +++ b/extract-files.sh @@ -114,11 +114,6 @@ function blob_fixup() { sed -i "s|/data/vendor/camera/cam_socket%d|/data/vendor/qcam/camer_socket%d|g" "${2}" ;; - # Remove libmedia.so dependency from lib-dplmedia.so - vendor/lib64/lib-dplmedia.so) - "${PATCHELF}" --remove-needed libmedia.so "${2}" - ;; - vendor/etc/permissions/qti_libpermissions.xml) sed -i 's|"android.hidl.manager-V1.0-java"|"android.hidl.manager@1.0-java"|' ${2} ;; @@ -132,7 +127,7 @@ function blob_fixup() { ;; system_ext/etc/permissions/qcrilhook.xml) - sed -i "s/\/system\/framework\//\/system\/system_ext\/framework\//g" "${2}" + sed -i "s/\/product\/framework\//\/system\/system_ext\/framework\//g" "${2}" ;; system_ext/etc/permissions/qti_libpermissions.xml) diff --git a/manifest.xml b/manifest.xml index 4f9e635..4d2faef 100644 --- a/manifest.xml +++ b/manifest.xml @@ -70,15 +70,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. </interface> </hal> <hal format="hidl"> - <name>android.hardware.configstore</name> - <transport>hwbinder</transport> - <version>1.1</version> - <interface> - <name>ISurfaceFlingerConfigs</name> - <instance>default</instance> - </interface> - </hal> - <hal format="hidl"> <name>android.hardware.drm</name> <transport>hwbinder</transport> <fqname>@1.2::ICryptoFactory/clearkey</fqname> @@ -167,17 +158,10 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. <hal format="hidl"> <name>android.hardware.radio</name> <transport>hwbinder</transport> - <version>1.1</version> - <interface> - <name>IRadio</name> - <instance>slot1</instance> - <instance>slot2</instance> - </interface> - <interface> - <name>ISap</name> - <instance>slot1</instance> - <instance>slot2</instance> - </interface> + <fqname>@1.2::ISap/slot1</fqname> + <fqname>@1.2::ISap/slot2</fqname> + <fqname>@1.4::IRadio/slot1</fqname> + <fqname>@1.4::IRadio/slot2</fqname> </hal> <hal format="hidl"> <name>android.hardware.sensors</name> @@ -236,7 +220,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. <hal format="hidl"> <name>com.qualcomm.qti.imscmservice</name> <transport>hwbinder</transport> - <version>1.0</version> + <version>2.2</version> <interface> <name>IImsCmService</name> <instance>qti.ims.connectionmanagerservice</instance> @@ -245,7 +229,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. <hal format="hidl"> <name>com.qualcomm.qti.uceservice</name> <transport>hwbinder</transport> - <version>1.0</version> + <version>2.1</version> <interface> <name>IUceService</name> <instance>com.qualcomm.qti.uceservice</instance> @@ -370,7 +354,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. <hal format="hidl"> <name>vendor.qti.hardware.radio.ims</name> <transport>hwbinder</transport> - <version>1.0</version> + <version>1.5</version> <interface> <name>IImsRadio</name> <instance>imsradio0</instance> @@ -400,7 +384,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. <hal format="hidl"> <name>vendor.qti.hardware.radio.qtiradio</name> <transport>hwbinder</transport> - <version>1.0</version> + <version>2.3</version> <interface> <name>IQtiRadio</name> <instance>slot1</instance> @@ -410,7 +394,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. <hal format="hidl"> <name>vendor.qti.hardware.radio.uim</name> <transport>hwbinder</transport> - <version>1.0</version> + <version>1.2</version> <interface> <name>IUim</name> <instance>Uim0</instance> @@ -447,12 +431,30 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. </interface> </hal> <hal format="hidl"> - <name>vendor.qti.imsrtpservice</name> + <name>vendor.qti.ims.callinfo</name> <transport>hwbinder</transport> <version>1.0</version> <interface> + <name>IService</name> + <instance>default</instance> + </interface> + </hal> + <hal format="hidl"> + <name>vendor.qti.imsrtpservice</name> + <transport>hwbinder</transport> + <version>2.1</version> + <interface> <name>IRTPService</name> <instance>imsrtpservice</instance> </interface> </hal> + <hal format="hidl"> + <name>android.hardware.radio.config</name> + <transport>hwbinder</transport> + <version>1.1</version> + <interface> + <name>IRadioConfig</name> + <instance>default</instance> + </interface> + </hal> </manifest> @@ -144,8 +144,10 @@ PRODUCT_PACKAGES += \ # Camera PRODUCT_PACKAGES += \ + android.hardware.camera.device@3.4:64 \ android.hardware.camera.provider@2.4-impl:32 \ android.hardware.camera.provider@2.4-service \ + android.hardware.camera.provider@2.5:64 \ camera.msm8996 # Common init scripts @@ -345,6 +347,9 @@ PRODUCT_PACKAGES += \ android.hardware.radio@1.4.vendor \ android.hardware.radio.config@1.0 \ android.hardware.radio.config@1.0.vendor \ + android.hardware.radio.config@1.2.vendor \ + android.hardware.radio.deprecated@1.0.vendor \ + android.hardware.secure_element@1.0.vendor \ librmnetctl # Seccomp policy diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc index 17d7dd3..62c8852 100644 --- a/rootdir/etc/init.qcom.rc +++ b/rootdir/etc/init.qcom.rc @@ -117,10 +117,6 @@ on post-fs-data mkdir /data/vendor/wifi/wpa 0770 wifi wifi mkdir /data/vendor/wifi/wpa/sockets 0770 wifi wifi - # Create netmgr log dir - mkdir /data/vendor/netmgr 0770 radio radio - chmod 0770 /data/vendor/netmgr - # Create the directories used by CnE subsystem mkdir /data/vendor/connectivity 0771 radio radio chown radio radio /data/vendor/connectivity @@ -274,9 +270,6 @@ on boot mkdir /mnt/vendor/persist/audio 0777 media audio mkdir /mnt/vendor/persist/display 0770 system graphics - # Create NETMGR daemon socket area - mkdir /dev/socket/netmgr 0750 radio radio - # LED torch permissions chown system system /sys/class/leds/led:torch_0/brightness chmod 0666 /sys/class/leds/led:torch_0/brightness @@ -297,11 +290,6 @@ on boot chmod 0664 /sys/class/graphics/fb0/mode chmod 0664 /sys/class/graphics/fb0/msm_cmd_autorefresh_en - # Assign TCP buffer thresholds to be ceiling value of technology maximums - # Increased technology maximums should be reflected here. - write /proc/sys/net/core/rmem_max 8388608 - write /proc/sys/net/core/wmem_max 8388608 - # Enable default router information in RA write /proc/sys/net/ipv6/conf/default/accept_ra_defrtr 1 @@ -333,6 +321,9 @@ on boot # Wifi firmware reload path chown wifi wifi /sys/module/wlan/parameters/fwpath + start vendor.qcrild + start vendor.qcrild2 + on property:sys.boot_completed=1 # Enable ZRAM on boot_complete swapon_all /vendor/etc/fstab.qcom @@ -377,18 +368,6 @@ service vendor.atfwd /vendor/bin/ATFWD-daemon group system radio writepid /dev/cpuset/system-background/tasks -service vendor.netmgrd /vendor/bin/netmgrd - class main - user root - group root wifi wakelock radio inet - writepid /dev/cpuset/system-background/tasks - -service vendor.dataqti /vendor/bin/qti - class main - user radio - group radio oem_2901 usb - writepid /dev/cpuset/system-background/tasks - service vendor.sensors.qti /vendor/bin/sensors.qti class core user system @@ -398,10 +377,6 @@ service vendor.sensors.qti /vendor/bin/sensors.qti capabilities NET_BIND_SERVICE writepid /dev/cpuset/system-background/tasks -on property:ro.vendor.use_data_netmgrd=false - # netmgr not supported on specific target - stop vendor.netmgrd - # Adjust socket buffer to enlarge TCP receive window for high bandwidth # but only if ro.data.large_tcp_window_size property is set. on property:ro.data.large_tcp_window_size=true @@ -410,6 +385,12 @@ on property:ro.data.large_tcp_window_size=true on property:sys.sysctl.tcp_adv_win_scale=* write /proc/sys/net/ipv4/tcp_adv_win_scale ${sys.sysctl.tcp_adv_win_scale} +service vendor.qrtr-ns /vendor/bin/qrtr-ns -f + class core + user vendor_qrtr + group vendor_qrtr + capabilities NET_BIND_SERVICE + service loc_launcher /vendor/bin/loc_launcher class late_start user gps diff --git a/vendor_prop.mk b/vendor_prop.mk index 8017042..b86f17a 100644 --- a/vendor_prop.mk +++ b/vendor_prop.mk @@ -84,7 +84,8 @@ PRODUCT_PROPERTY_OVERRIDES += \ persist.vendor.data.mode=concurrent \ persist.radio.aosp_usr_pref_sel=true \ persist.data.netmgrd.qos.enable=true \ - ro.vendor.use_data_netmgrd=true + ro.vendor.use_data_netmgrd=true \ + persist.vendor.data.mode=concurrent # Display PRODUCT_PROPERTY_OVERRIDES += \ @@ -135,7 +136,7 @@ PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PROPERTY_OVERRIDES += \ DEVICE_PROVISIONED=1 \ rild.libpath=/vendor/lib64/libril-qc-qmi-1.so \ - vendor.rild.libpath=/vendor/lib64/libril-qc-qmi-1.so \ + persist.vendor.radio.apm_sim_not_pwdn=1 \ ril.subscription.types=NV,RUIM \ ro.telephony.default_network=10 \ telephony.lteOnCdmaDevice=1 \ |