chiron: Bringup telephony after U QPR2

Co-authored-by: Georg Veichtlbauer <[email protected]> Co-authored-by: Nanhumly <[email protected]> Change-Id: I36aacf1cfc46b7011d741c6957c0059520e376fb
BYZYB · Apr 14, 2024 · 85ce15e · 85ce15e
1 parent 5d8e959
commit 85ce15e
Show file tree

Hide file tree

Showing 11 changed files with 75 additions and 227 deletions.
diff --git a/BoardConfig.mk b/BoardConfig.mk
@@ -120,7 +120,7 @@ TARGET_RECOVERY_UI_MARGIN_STATUSBAR := 50
 TARGET_USERIMAGES_USE_EXT4 := true
 
 # RIL
-TARGET_USES_OLD_MNC_FORMAT := true
+ENABLE_VENDOR_RIL_SERVICE := true
 
 # Security patch level
 VENDOR_SECURITY_PATCH := 2019-09-01

diff --git a/configs/qmi_fw.conf b/configs/qmi_fw.conf
@@ -0,0 +1,3 @@
+# Debug messages with priority >= ANDROID_LOG_WARN
+QMI_CCI_DEBUG_LEVEL=5
+QMI_CSI_DEBUG_LEVEL=5
diff --git a/configs/system_ext-privapp-permissions-qti.xml b/configs/system_ext-privapp-permissions-qti.xml
@@ -28,13 +28,21 @@ It allows additional grants on top of privapp-permissions-platform.xml
 -->
 
 <permissions>
+    <privapp-permissions package="com.quicinc.cne.CNEService">
+        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
+        <permission name="android.permission.PACKET_KEEPALIVE_OFFLOAD"/>
+    </privapp-permissions>
+
     <privapp-permissions package="com.qualcomm.qcrilmsgtunnel">
-        <permission name="android.permission.INTERACT_ACROSS_USERS" />
+        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
     </privapp-permissions>
 
     <privapp-permissions package="org.codeaurora.ims">
-        <permission name="android.permission.INTERACT_ACROSS_USERS" />
-        <permission name="android.permission.READ_PRECISE_PHONE_STATE" />
-        <permission name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME" />
+        <permission name="android.permission.MODIFY_PHONE_STATE"/>
+        <permission name="android.permission.READ_PRECISE_PHONE_STATE"/>
+        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
+        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
+        <permission name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME"/>
+        <permission name="android.permission.WRITE_SECURE_SETTINGS" />
     </privapp-permissions>
 </permissions>
diff --git a/device.mk b/device.mk
@@ -161,8 +161,7 @@ PRODUCT_PACKAGES += IFAAService
 PRODUCT_PACKAGES += \
     ims_ext_common.xml \
     ims-ext-common \
-    libgui_shim \
-    libui_shim:64
+    libgui_shim
 
 # IRQ
 PRODUCT_COPY_FILES += $(LOCAL_PATH)/configs/msm_irqbalance.conf:$(TARGET_COPY_OUT_VENDOR)/etc/msm_irqbalance.conf
@@ -312,10 +311,11 @@ PRODUCT_COPY_FILES += \
 
 # RIL
 PRODUCT_PACKAGES += \
-    [email protected] \
-    [email protected] \
-    [email protected] \
-    libril-wrapper \
+    [email protected] \
+    [email protected] \
+    [email protected] \
+    [email protected] \
+    libavservices_minijail.vendor \
     librmnetctl
 
 # Seccomp policy
@@ -339,6 +339,8 @@ PRODUCT_SOONG_NAMESPACES += \
 # Telephony
 PRODUCT_BOOT_JARS += telephony-ext
 
+PRODUCT_COPY_FILES += $(LOCAL_PATH)/configs/qmi_fw.conf:$(TARGET_COPY_OUT_VENDOR)/etc/qmi_fw.conf
+
 PRODUCT_PACKAGES += \
     qti_telephony_hidl_wrapper.xml \
     qti_telephony_utils.xml \
@@ -353,10 +355,6 @@ PRODUCT_PACKAGES += [email protected]_role_usb
 PRODUCT_PACKAGES += vendor.qti.hardware.vibrator.service
 
 # VNDK
-PRODUCT_COPY_FILES += \
-    prebuilts/vndk/v32/arm64/arch-arm64-armv8-a/shared/vndk-sp/libhidlbase.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libhidlbase-v32.so \
-    prebuilts/vndk/v32/arm64/arch-arm64-armv8-a/shared/vndk-sp/libhidlbase.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libhidlbase-v32.so
-
 PRODUCT_PACKAGES += \
     libdng_sdk.vendor_32 \
     libstdc++_vendor

diff --git a/manifest.xml b/manifest.xml
@@ -79,19 +79,15 @@
     <hal format="hidl">
         <name>android.hardware.radio</name>
         <transport>hwbinder</transport>
-        <fqname>@1.1::IRadio/slot1</fqname>
-        <fqname>@1.1::IRadio/slot2</fqname>
+        <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.radio.config</name>
         <transport>hwbinder</transport>
-        <fqname>@1.0::IRadioConfig/default</fqname>
-    </hal>
-    <hal format="hidl">
-        <name>android.hardware.radio.deprecated</name>
-        <transport>hwbinder</transport>
-        <fqname>@1.0::IOemHook/slot1</fqname>
-        <fqname>@1.0::IOemHook/slot2</fqname>
+        <fqname>@1.1::IRadioConfig/default</fqname>
     </hal>
     <hal format="hidl">
         <name>android.hardware.sensors</name>
@@ -163,7 +159,7 @@
     <hal format="hidl">
         <name>vendor.qti.data.factory</name>
         <transport>hwbinder</transport>
-        <fqname>@2.0::IFactory/default</fqname>
+        <fqname>@2.3::IFactory/default</fqname>
     </hal>
     <hal format="hidl">
         <name>vendor.qti.hardware.alarm</name>
@@ -185,6 +181,18 @@
         <transport>hwbinder</transport>
         <fqname>@1.0::ILinkLatency/default</fqname>
     </hal>
+    <hal format="hidl">
+        <name>vendor.qti.hardware.data.connection</name>
+        <transport>hwbinder</transport>
+        <fqname>@1.1::IDataConnection/slot1</fqname>
+        <fqname>@1.1::IDataConnection/slot2</fqname>
+    </hal>
+    <hal format="hidl">
+        <name>vendor.qti.hardware.data.iwlan</name>
+        <transport>hwbinder</transport>
+        <fqname>@1.0::IIWlan/slot1</fqname>
+        <fqname>@1.0::IIWlan/slot2</fqname>
+    </hal>
     <hal format="hidl">
         <name>vendor.qti.hardware.radio.am</name>
         <transport>hwbinder</transport>
@@ -199,13 +207,14 @@
     <hal format="hidl">
         <name>vendor.qti.hardware.radio.ims</name>
         <transport>hwbinder</transport>
-        <fqname>@1.0::IImsRadio/imsradio0</fqname>
-        <fqname>@1.0::IImsRadio/imsradio1</fqname>
+        <fqname>@1.6::IImsRadio/imsradio0</fqname>
+        <fqname>@1.6::IImsRadio/imsradio1</fqname>
     </hal>
     <hal format="hidl">
         <name>vendor.qti.hardware.radio.lpa</name>
         <transport>hwbinder</transport>
-        <fqname>@1.0::IUimLpa/UimLpa0</fqname>
+        <fqname>@1.1::IUimLpa/UimLpa0</fqname>
+        <fqname>@1.1::IUimLpa/UimLpa1</fqname>
     </hal>
     <hal format="hidl">
         <name>vendor.qti.hardware.radio.qcrilhook</name>
@@ -216,14 +225,14 @@
     <hal format="hidl">
         <name>vendor.qti.hardware.radio.qtiradio</name>
         <transport>hwbinder</transport>
-        <fqname>@1.0::IQtiRadio/slot1</fqname>
-        <fqname>@1.0::IQtiRadio/slot2</fqname>
+        <fqname>@2.4::IQtiRadio/slot1</fqname>
+        <fqname>@2.4::IQtiRadio/slot2</fqname>
     </hal>
     <hal format="hidl">
         <name>vendor.qti.hardware.radio.uim</name>
         <transport>hwbinder</transport>
-        <fqname>@1.1::IUim/Uim0</fqname>
-        <fqname>@1.1::IUim/Uim1</fqname>
+        <fqname>@1.2::IUim/Uim0</fqname>
+        <fqname>@1.2::IUim/Uim1</fqname>
     </hal>
     <hal format="hidl">
         <name>vendor.qti.hardware.radio.uim_remote_client</name>
@@ -247,15 +256,10 @@
         <transport>hwbinder</transport>
         <fqname>@1.0::ITuiComm/default</fqname>
     </hal>
-    <hal format="hidl">
-        <name>vendor.qti.ims.callinfo</name>
-        <transport>hwbinder</transport>
-        <fqname>@1.0::IService/default</fqname>
-    </hal>
     <hal format="hidl">
         <name>vendor.qti.imsrtpservice</name>
         <transport>hwbinder</transport>
-        <fqname>@1.0::IRTPService/imsrtpservice</fqname>
+        <fqname>@3.0::IRTPService/imsrtpservice</fqname>
     </hal>
     <hal format="hidl">
         <name>vendor.xiaomi.hardware.mlipay</name>

diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -165,6 +165,12 @@
     <bool name="config_device_wfc_ims_available">true</bool>
     <!-- Flag specifying whether WFC over IMS should be available for carrier: independent of carrier provisioning. If false: hard disabled. If true: then depends on carrier provisioning, availability etc -->
     <bool name="config_carrier_wfc_ims_available">true</bool>
+    <!-- IWLAN data service package name to bind to by default. If none is specified in an overlay, an empty string is passed in -->
+    <string name="config_wlan_data_service_package">vendor.qti.iwlan</string>
+    <!-- IWLAN network service package name to bind to by default. If none is specified in an overlay, an empty string is passed in -->
+    <string name="config_wlan_network_service_package">vendor.qti.iwlan</string>
+    <!-- Telephony qualified networks service package name to bind to by default. -->
+    <string name="config_qualified_networks_service_package">vendor.qti.iwlan</string>
     <!-- Config determines whether to update phone object when voice registration state changes. Voice radio tech change will always trigger an update of phone object irrespective of this config -->
     <bool name="config_switch_phone_on_voice_reg_state_change">false</bool>
     <!-- Number of physical SIM slots on the device. This includes both eSIM and pSIM slots, and is not necessarily the same as the number of phones/logical modems supported by the device. For example, a multi-sim device can have 2 phones/logical modems, but 3 physical slots, or a single SIM device can have 1 phones/logical modems, but 2 physical slots (one eSIM and one pSIM) -->

diff --git a/ril-wrapper/Android.mk b/ril-wrapper/Android.mk
diff --git a/ril-wrapper/ril-wrapper.c b/ril-wrapper/ril-wrapper.c