diff -uNar a/build/make/target/product/telephony.mk b/build/make/target/product/telephony.mk
--- a/build/make/target/product/telephony.mk 2021-03-09 14:42:23.325562800 +0800
+++ b/build/make/target/product/telephony.mk 2022-03-24 11:33:04.357334700 +0800
@@ -24,6 +24,7 @@
CallLogBackup \
CellBroadcastReceiver \
EmergencyInfo \
+ messaging \
rild
PRODUCT_COPY_FILES := \
diff -uNar a/device/fsl/imx8m/evk_8mm/BoardConfig.mk b/device/fsl/imx8m/evk_8mm/BoardConfig.mk
--- a/device/fsl/imx8m/evk_8mm/BoardConfig.mk 2021-09-10 09:06:36.552703400 +0800
+++ b/device/fsl/imx8m/evk_8mm/BoardConfig.mk 2022-04-11 14:45:36.132043800 +0800
@@ -134,7 +134,7 @@
endif
KERNEL_NAME := Image
-BOARD_KERNEL_CMDLINE := init=/init androidboot.console=ttymxc1 androidboot.hardware=freescale cma=$(CMASIZE) androidboot.primary_display=imx-drm firmware_class.path=/vendor/firmware transparent_hugepage=never androidboot.selinux=permissive
+BOARD_KERNEL_CMDLINE := init=/init androidboot.console=ttymxc1 androidboot.hardware=freescale cma=$(CMASIZE) androidboot.primary_display=imx-drm firmware_class.path=/vendor/firmware transparent_hugepage=never
# Default wificountrycode
BOARD_KERNEL_CMDLINE += androidboot.wificountrycode=CN
@@ -142,6 +142,9 @@
# Defaultly evk_8mm use QCA 1PJ wifi module, if use BCM 1MW module, set androidboot.wifivendor=bcm
BOARD_KERNEL_CMDLINE += androidboot.wifivendor=bcm
+# enable close selinux permissive mode
+BOARD_KERNEL_CMDLINE += androidboot.selinux=permissive
+
ifeq ($(TARGET_USERIMAGES_USE_UBIFS),true)
ifeq ($(TARGET_USERIMAGES_USE_EXT4),true)
$(error "TARGET_USERIMAGES_USE_UBIFS and TARGET_USERIMAGES_USE_EXT4 config open in same time, please only choose one target file system image")
diff -uNar a/device/fsl/imx8m/evk_8mm/evk_8mm.mk b/device/fsl/imx8m/evk_8mm/evk_8mm.mk
--- a/device/fsl/imx8m/evk_8mm/evk_8mm.mk 2021-09-10 09:06:36.552703400 +0800
+++ b/device/fsl/imx8m/evk_8mm/evk_8mm.mk 2022-04-11 14:47:14.146315600 +0800
@@ -171,13 +171,6 @@
vendor/nxp/imx-firmware/cyw-wifi-bt/1DX_CYW43430/BCM43430A1.1DX.hcd:$(TARGET_COPY_OUT_VENDOR)/firmware/brcm/BCM43430A1.1DX.hcd \
vendor/nxp/imx-firmware/cyw-wifi-bt/1DX_CYW43430/CYW4343A1_001.002.009.0096.0415.hcd:$(TARGET_COPY_OUT_VENDOR)/firmware/brcm/CYW4343A1_001.002.009.0096.0415.hcd
-# EETI Touch
-PRODUCT_COPY_FILES += \
- vendor/nxp/imx-firmware/EETI/eGTouchA.ini:$(TARGET_COPY_OUT_VENDOR)/firmware/EETI/eGTouchA.ini \
- vendor/nxp/imx-firmware/EETI/eGalaxTouch_VirtualDevice.idc:$(TARGET_COPY_OUT_SYSTEM)/usr/idc/eGalaxTouch_VirtualDevice.idc \
- vendor/nxp/imx-firmware/EETI/eGTouchD:$(TARGET_COPY_OUT_SYSTEM)/bin/eGTouchD \
- vendor/nxp/imx-firmware/EETI/eGTouchD.sh:$(TARGET_COPY_OUT_SYSTEM)/bin/eGTouchD.sh
-
# WiFi HAL
PRODUCT_PACKAGES += \
android.hardware.wifi@1.0-service \
@@ -273,3 +266,14 @@
gatekeeper.trusty \
storageproxyd
endif
+
+# for SIMCOM7600G
+PRODUCT_COPY_FILES += \
+ vendor/nxp/imx-firmware/X64/rild:$(TARGET_COPY_OUT_VENDOR)/bin/hw/rild \
+ vendor/nxp/imx-firmware/X64/libril.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libril.so \
+ vendor/nxp/imx-firmware/X64/libreference-ril.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libreference-ril.so \
+ vendor/nxp/imx-firmware/X64/apns-conf.xml:/system/etc/apns-conf.xml
+
+PRODUCT_PROPERTY_OVERRIDES += \
+ rild.simcom.ndis=1 \
+ rild.libpath = /vendor/lib64/libreference-ril.so
diff -uNar a/device/fsl/imx8m/evk_8mm/manifest.xml b/device/fsl/imx8m/evk_8mm/manifest.xml
--- a/device/fsl/imx8m/evk_8mm/manifest.xml 2022-04-11 15:34:18.776549200 +0800
+++ b/device/fsl/imx8m/evk_8mm/manifest.xml 2022-04-11 14:46:24.009131900 +0800
@@ -145,7 +145,7 @@
default
-
+
android.hardware.memtrack
hwbinder
1.0
@@ -235,4 +235,22 @@
default
+
+ android.hardware.radio.deprecated
+ hwbinder
+ 1.0
+
+ IOemHook
+ slot1
+
+
+
+ android.hardware.radio
+ hwbinder
+ 1.0
+
+ IRadio
+ slot1
+
+
diff -uNar a/device/fsl/imx8m/evk_8mm/overlay/frameworks/base/core/res/res/values/config.xml b/device/fsl/imx8m/evk_8mm/overlay/frameworks/base/core/res/res/values/config.xml
--- a/device/fsl/imx8m/evk_8mm/overlay/frameworks/base/core/res/res/values/config.xml 2021-09-10 09:06:29.439542900 +0800
+++ b/device/fsl/imx8m/evk_8mm/overlay/frameworks/base/core/res/res/values/config.xml 2022-03-24 11:55:09.649922600 +0800
@@ -74,6 +74,7 @@
- "wifi,1,1,1,-1,true"
+ - "mobile,0,0,0,-1,true"
- "bluetooth,7,7,2,-1,true"
- "ethernet,9,9,2,-1,true"
@@ -183,7 +184,8 @@
true
- false
+ true
+ true
true
diff -uNar a/device/fsl/imx8m/ProductConfigCommon.mk b/device/fsl/imx8m/ProductConfigCommon.mk
--- a/device/fsl/imx8m/ProductConfigCommon.mk 2021-03-09 14:42:54.106239300 +0800
+++ b/device/fsl/imx8m/ProductConfigCommon.mk 2022-03-24 11:55:09.649922600 +0800
@@ -1,6 +1,10 @@
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/languages_full.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/generic.mk)
+#========================== SIMCOM START ================================
+$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony.mk)
+#========================== SIMCOM START ================================
ifeq ($(PRODUCT_IMX_CAR),true)
$(call inherit-product, packages/services/Car/car_product/build/car.mk)
endif
@@ -316,7 +320,7 @@
# wifionly device
PRODUCT_PROPERTY_OVERRIDES += \
- ro.radio.noril=yes
+ ro.radio.noril=false
PRODUCT_PROPERTY_OVERRIDES += \
ro.mediacomponents.package=com.nxp.extractorpkg
diff -uNar a/frameworks/base/telephony/java/com/android/internal/telephony/RILConstants.java b/frameworks/base/telephony/java/com/android/internal/telephony/RILConstants.java
--- a/frameworks/base/telephony/java/com/android/internal/telephony/RILConstants.java 2021-03-09 14:43:57.975631300 +0800
+++ b/frameworks/base/telephony/java/com/android/internal/telephony/RILConstants.java 2022-03-24 12:01:00.692934600 +0800
@@ -164,7 +164,7 @@
int NETWORK_MODE_TDSCDMA_CDMA_EVDO_GSM_WCDMA = 21; /*TD-SCDMA,EvDo,CDMA,GSM/WCDMA*/
int NETWORK_MODE_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA = 22; /* TD-SCDMA/LTE/GSM/WCDMA, CDMA, and EvDo */
int PREFERRED_NETWORK_MODE = Integer.parseInt(TelephonyManager.getTelephonyProperty(0,
- "ro.telephony.default_network", Integer.toString(NETWORK_MODE_WCDMA_PREF)));
+ "ro.telephony.default_network", Integer.toString(NETWORK_MODE_LTE_TDSCDMA_GSM_WCDMA)));
int BAND_MODE_UNSPECIFIED = 0; //"unspecified" (selected by baseband automatically)
int BAND_MODE_EURO = 1; //"EURO band" (GSM-900 / DCS-1800 / WCDMA-IMT-2000)
diff -uNar a/hardware/ril/rild/rild.rc b/hardware/ril/rild/rild.rc
--- a/hardware/ril/rild/rild.rc 2021-03-09 14:44:11.199917800 +0800
+++ b/hardware/ril/rild/rild.rc 2022-03-24 12:57:14.721359400 +0800
@@ -1,5 +1,11 @@
-service vendor.ril-daemon /vendor/bin/hw/rild
+# simcom_add
+service vendor.ril-daemon /vendor/bin/hw/rild -l /vendor/lib64/libreference-ril.so
class main
- user radio
- group radio cache inet misc audio log readproc wakelock
- capabilities BLOCK_SUSPEND NET_ADMIN NET_RAW
+ socket rild stream 660 root radio
+ socket rild-debug stream 660 radio system
+ socket sap_uim_socket1 stream 660 bluetooth bluetooth
+ socket rild-gps stream 660 radio system
+
+ user root
+ group radio cache inet misc audio log sdcard_rw log
+# simcom_end
\ No newline at end of file
diff -uNar a/packages/services/Telephony/res/values/config.xml b/packages/services/Telephony/res/values/config.xml
--- a/packages/services/Telephony/res/values/config.xml 2021-03-09 14:44:41.496571700 +0800
+++ b/packages/services/Telephony/res/values/config.xml 2022-03-24 11:59:25.002638800 +0800
@@ -137,7 +137,7 @@
true
- false
+ true
false
diff -uNar a/system/core/init/devices.cpp b/system/core/init/devices.cpp
--- a/system/core/init/devices.cpp 2021-03-09 14:46:23.118338000 +0800
+++ b/system/core/init/devices.cpp 2022-03-24 11:29:13.501268700 +0800
@@ -408,8 +408,13 @@
devpath = StringPrintf("/dev/bus/usb/%03d/%03d", bus_id, device_id);
}
} else if (StartsWith(uevent.subsystem, "usb")) {
+ // add by simcom for mknod /dev/cdc-wdm0
+ if (uevent.subsystem == "usbmisc" && !uevent.device_name.empty()) {
+ devpath = "/dev/" + uevent.device_name;
+ } else {
// ignore other USB events
return;
+ }
} else {
devpath = "/dev/" + Basename(uevent.path);
}
diff -uNar a/system/core/rootdir/init.rc b/system/core/rootdir/init.rc
--- a/system/core/rootdir/init.rc 2021-05-12 17:19:40.636347800 +0800
+++ b/system/core/rootdir/init.rc 2022-03-24 11:29:13.501268700 +0800
@@ -669,6 +669,9 @@
chown system system /sys/kernel/ipv4/tcp_rmem_max
chown root radio /proc/cmdline
+ #add by simcom
+ chmod 0777 /vendor/bin/hw/rild
+
# Define default initial receive window size in segments.
setprop net.tcp.default_init_rwnd 60
diff -uNar a/system/core/rootdir/ueventd.rc b/system/core/rootdir/ueventd.rc
--- a/system/core/rootdir/ueventd.rc 2021-03-09 14:46:24.402357200 +0800
+++ b/system/core/rootdir/ueventd.rc 2022-03-24 11:29:13.501268700 +0800
@@ -65,6 +65,10 @@
# kms driver for drm based gpu
/dev/dri/* 0666 root graphics
+# simcom_add modify ttyUSB*
+/dev/ttyUSB* 0660 radio radio
+# simcom_end
+
# these should not be world writable
/dev/diag 0660 radio radio
/dev/diag_arm9 0660 radio radio
diff -uNar a/vendor/nxp/imx-firmware/X64/apns-conf.xml b/vendor/nxp/imx-firmware/X64/apns-conf.xml
--- a/vendor/nxp/imx-firmware/X64/apns-conf.xml 1970-01-01 08:00:00.000000000 +0800
+++ b/vendor/nxp/imx-firmware/X64/apns-conf.xml 2022-03-17 15:28:46.000000000 +0800
@@ -0,0 +1,47 @@
+
+
+
+
+
+
+
+
+
+
+
diff -uNar a/vendor/nxp/imx-firmware/X64/libreference-ril.so b/vendor/nxp/imx-firmware/X64/libreference-ril.so
--- a/vendor/nxp/imx-firmware/X64/libreference-ril.so 1970-01-01 08:00:00.000000000 +0800
+++ b/vendor/nxp/imx-firmware/X64/libreference-ril.so 2021-11-26 10:38:46.000000000 +0800
@@ -0,0 +1,1318 @@
+ELF @ > @ 8 @ @ @ @ d
+ d
+ 0 0> 0> &