BoardConfigCommon.mk

@@ -210,8 +210,8 @@ TARGET_RELEASETOOLS_EXTENSIONS := $(COMMON_PATH)/releasetools
 # SePolicy
 include device/qcom/sepolicy_vndr/SEPolicy.mk
 BOARD_VENDOR_SEPOLICY_DIRS += $(COMMON_PATH)/sepolicy/vendor
-PRODUCT_PRIVATE_SEPOLICY_DIRS += $(COMMON_PATH)/sepolicy/private
+SYSTEM_EXT_PRIVATE_SEPOLICY_DIRS += $(COMMON_PATH)/sepolicy/private
-PRODUCT_PUBLIC_SEPOLICY_DIRS += $(COMMON_PATH)/sepolicy/public
+SYSTEM_EXT_PUBLIC_SEPOLICY_DIRS += $(COMMON_PATH)/sepolicy/public
 
 # Vibrator
 $(call soong_config_set,samsungVibratorVars,duration_amplitude,true)

audio/impl/Android.bp

@@ -68,7 +68,6 @@ cc_library_shared {
         "android.hardware.audio@2.0-util",
         "android.hardware.audio.common@2.0",
         "android.hardware.audio.common@2.0-util",
-        "libcutils",
     ],
     cflags: [
         "-DMAJOR_VERSION=2",
@@ -86,7 +85,6 @@ cc_library_shared {
         "android.hardware.audio@4.0-util",
         "android.hardware.audio.common@4.0",
         "android.hardware.audio.common@4.0-util",
-        "libcutils",
     ],
     cflags: [
         "-DMAJOR_VERSION=4",
@@ -103,7 +101,6 @@ cc_library_shared {
         "android.hardware.audio@5.0-util",
         "android.hardware.audio.common@5.0",
         "android.hardware.audio.common@5.0-util",
-        "libcutils",
     ],
     cflags: [
         "-DMAJOR_VERSION=5",
@@ -120,7 +117,6 @@ cc_library_shared {
         "android.hardware.audio@6.0-util",
         "android.hardware.audio.common@6.0",
         "android.hardware.audio.common@6.0-util",
-        "libcutils",
     ],
     cflags: [
         "-DMAJOR_VERSION=6",
@@ -139,7 +135,6 @@ cc_library_shared {
         "android.hardware.audio.common@7.0-enums",
         "android.hardware.audio.common@7.0-util",
         "libbase",
-        "libcutils",
     ],
     cflags: [
         "-DMAJOR_VERSION=7",
@@ -159,7 +154,6 @@ cc_library_shared {
         "android.hardware.audio.common@7.1-enums",
         "android.hardware.audio.common@7.1-util",
         "libbase",
-        "libcutils",
     ],
     cflags: [
         "-DMAJOR_VERSION=7",

audio/impl/PrimaryDevice.cpp

@@ -19,9 +19,6 @@
 #include "core/default/PrimaryDevice.h"
 #include "core/default/Util.h"
 
-#include <cutils/properties.h>
-#include <string.h>
-
 #if MAJOR_VERSION >= 4
 #include <cmath>
 #endif
@@ -211,34 +208,6 @@ Return<Result> PrimaryDevice::setVoiceVolume(float volume) {
 }
 
 Return<Result> PrimaryDevice::setMode(AudioMode mode) {
-    /* On stock ROM Samsung sets the g_call_state and g_call_sim_slot audio parameters
-     * in the framework, breaking it on AOSP ROMs.
-     * For the g_call_sim_slot parameter 0x01 describes SIM1 and 0x02 SIM2.
-     */
-
-    char simSlot1[92], simSlot2[92];
-
-    // These props return either 0 (not calling),
-    // or 1 (SIM is calling)
-    property_get("vendor.calls.slot_id0", simSlot1, "");
-    property_get("vendor.calls.slot_id1", simSlot2, "");
-
-    // Wait until one sim slot reports a call
-    if (mode == AudioMode::IN_CALL) {
-        while (strcmp(simSlot1, "0") == 0 && strcmp(simSlot2, "0") == 0) {
-            property_get("vendor.calls.slot_id0", simSlot1, "");
-            property_get("vendor.calls.slot_id1", simSlot2, "");
-        }
-    }
-
-    if (strcmp(simSlot1, "1") == 0) {
-        // SIM1
-        mDevice->halSetParameters("g_call_sim_slot=0x01");
-    } else if (strcmp(simSlot2, "1") == 0) {
-        // SIM2
-        mDevice->halSetParameters("g_call_sim_slot=0x02");
-    }
-
     // INVALID, CURRENT, CNT, MAX are reserved for internal use.
     // TODO: remove the values from the HIDL interface
     switch (mode) {

audio/impl/include/core/default/Device.h

@@ -173,8 +173,6 @@ struct Device : public IDevice, public ParametersUtil {
 
     uint32_t version() const { return mDevice->common.version; }
 
-    int halSetParameters(const char* keysAndValues) override;
-
   private:
     bool mIsClosed;
     audio_hw_device_t* mDevice;
@@ -193,6 +191,7 @@ struct Device : public IDevice, public ParametersUtil {
 
     // Methods from ParametersUtil.
     char* halGetParameters(const char* keys) override;
+    int halSetParameters(const char* keysAndValues) override;
 };
 
 }  // namespace implementation

audio/service/Android.bp

@@ -0,0 +1,30 @@
+//
+// Copyright (C) 2023 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+cc_binary {
+    name: "audio_parameter_service.samsung_sm7125",
+    init_rc: ["audio_parameter_service.rc"],
+    system_ext_specific: true,
+    srcs: [
+        "audio_parameter_service.cpp",
+    ],
+    shared_libs: [
+        "libbase",
+        "libutils",
+        "libhidlbase",
+        "liblog",
+        "android.hardware.audio@7.0",
+    ],
+}

audio/service/audio_parameter_service.cpp

@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2023 The LineageOS Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <android-base/properties.h>
+#include <android-base/logging.h>
+#include <android/hardware/audio/7.0/IDevicesFactory.h>
+
+using android::base::GetProperty;
+using android::base::SetProperty;
+using android::sp;
+using ::android::hardware::hidl_string;
+
+int main() {
+    sp<::android::hardware::audio::V7_0::IDevice> audioDevice;
+
+    LOG(DEBUG) << "Passing g_call_sim_slot parameter";
+
+    if (!audioDevice) {
+        ::android::hardware::audio::V7_0::IDevicesFactory::getService()->openDevice(
+            "primary", [&](::android::hardware::audio::V7_0::Result, const sp<::android::hardware::audio::V7_0::IDevice>& result) {
+                    audioDevice = result;
+        });
+    }
+
+    if (audioDevice != nullptr) {
+        std::string value = "";
+
+        if (strcmp(GetProperty("vendor.calls.slotid", "-1").c_str(), "1") == 0) {
+            // SIM 2
+            value = "0x02";
+        }
+
+        audioDevice->setParameters({}, {{"g_call_sim_slot", value}});
+    }
+
+    if (audioDevice != nullptr)
+        audioDevice->close();
+
+    SetProperty("vendor.calls.parameter_state", "1");
+
+    return 0;
+}

audio/service/audio_parameter_service.rc

@@ -0,0 +1,16 @@
+service audio_parameter_service /system_ext/bin/audio_parameter_service.samsung_sm7125
+    oneshot
+    disabled
+
+on boot
+    setprop vendor.calls.parameter_state 0
+
+on property:vendor.calls.slotid=1 && property:vendor.calls.parameter_state=0
+    stop audioserver
+    start audioserver
+    start audio_parameter_service
+
+on property:vendor.calls.slotid=-1 && property:vendor.calls.parameter_state=1
+    setprop vendor.calls.parameter_state 0
+    stop audioserver
+    start audioserver

common.mk

@@ -49,7 +49,7 @@ PRODUCT_PACKAGES += \
     init.audio.samsung.rc \
     init.nfc.samsung.rc \
     init.vendor.onebinary.rc \
-    vendor.samsung.rilchip.qcom.rc \
+    init.vendor.rilchip.rc \
     init.vendor.rilcommon.rc \
     init.vendor.sensors.rc
 
@@ -73,7 +73,7 @@ PRODUCT_PACKAGES += \
     libqcomvoiceprocessing \
     libqcompostprocbundle \
     libvolumelistener \
-    libprocessgroup.vendor
+    audio_parameter_service.samsung_sm7125
 
 PRODUCT_COPY_FILES += \
     $(COMMON_PATH)/audio/configs/audio_configs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_configs.xml \
@@ -102,7 +102,7 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
     android.hardware.camera.provider@2.5-service.samsung \
     libgrallocusage.vendor \
-    vendor.qti.hardware.camera.device@1.0.vendor
+    vendor.qti.hardware.camera.device@1.0.vendor \
 
 # CAS
 PRODUCT_PACKAGES += \
@@ -334,17 +334,16 @@ PRODUCT_COPY_FILES += \
 
 # Power
 PRODUCT_PACKAGES += \
-    android.hardware.power-service.pixel-libperfmgr \
+    android.hardware.power-service.samsung-libperfmgr \
     android.hardware.power@1.2.vendor
 
 PRODUCT_COPY_FILES += \
     $(COMMON_PATH)/configs/powerhint.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.json
 
-# QCOM
+# QMI
 PRODUCT_PACKAGES += \
     libjson \
-    libprotobuf-cpp-lite-3.9.1-vendorcompat \
+    libprotobuf-cpp-lite-3.9.1-vendorcompat
-    libsqlite.vendor
 
 # Radio
 PRODUCT_PACKAGES += \
@@ -362,9 +361,7 @@ PRODUCT_PACKAGES += \
     libxml2 \
     librilutils \
     librmnetctl \
-    secril_config_svc \
+    secril_config_svc
-    sehradiomanager \
-    libjsoncpp.vendor
 
 # Sensors
 PRODUCT_PACKAGES += \
@@ -379,8 +376,7 @@ PRODUCT_COPY_FILES += \
 # Thermal
 PRODUCT_PACKAGES += \
     android.hardware.thermal@2.0.vendor \
-    android.frameworks.cameraservice.service@2.1.vendor \
+    android.frameworks.cameraservice.service@2.1.vendor
-    libcamera_metadata.vendor
 
 # Touch features
 PRODUCT_PACKAGES += \
@@ -452,7 +448,8 @@ PRODUCT_SOONG_NAMESPACES += \
     $(COMMON_PATH) \
     hardware/google/interfaces \
     hardware/google/pixel \
-    hardware/samsung
+    hardware/samsung \
+    hardware/samsung/aidl/power-libperfmgr
 
 # Prop files
 TARGET_SYSTEM_PROP += $(COMMON_PATH)/system.prop

configs/framework_compatibility_matrix.xml

@@ -820,7 +820,7 @@
     </hal>
     <hal format="hidl" optional="true">
         <name>vendor.samsung.hardware.radio</name>
-        <version>2.2</version>
+        <version>2.1</version>
         <interface>
             <name>ISehRadio</name>
             <instance>slot1</instance>

configs/manifest.xml

@@ -423,14 +423,14 @@
     <hal format="hidl">
         <name>vendor.samsung.hardware.radio</name>
         <transport>hwbinder</transport>
-        <version>2.2</version>
+        <version>2.1</version>
         <interface>
             <name>ISehRadio</name>
             <instance>slot1</instance>
             <instance>slot2</instance>
         </interface>
-        <fqname>@2.2::ISehRadio/slot1</fqname>
+        <fqname>@2.1::ISehRadio/slot1</fqname>
-        <fqname>@2.2::ISehRadio/slot2</fqname>
+        <fqname>@2.1::ISehRadio/slot2</fqname>
     </hal>
     <hal format="hidl">
         <name>vendor.samsung.hardware.radio.bridge</name>

configs/wifi/WCNSS_qcom_cfg.ini

@@ -173,8 +173,8 @@ gSetRxChainmask1x1=1
 # Scan Timing Parameters
 # gPassiveMaxChannelTime=110
 # gPassiveMinChannelTime=60
-gActiveMaxChannelTime=80
+gActiveMaxChannelTime=40
-gActiveMinChannelTime=60
+gActiveMinChannelTime=20
 
 #If set to 0, MCC is not allowed.
 gEnableMCCMode=1

configs/wifi/wpa_supplicant_overlay.conf

@@ -1,6 +1,4 @@
 p2p_disabled=1
 update_config=1
 pmf=1
-tdls_external_control=1
+tdls_external_control=1
-#PMK Lifetime value 259200 = 72 hours
-dot11RSNAConfigPMKLifetime=259200

extract-files.sh

@@ -62,9 +62,9 @@ function blob_fixup() {
     case "${1}" in
         vendor/lib64/libsec-ril.so|vendor/lib64/libsec-ril-dsds.so)
             # Replace SlotID prop
-            sed -i 's/ril.dds.call.ongoing/vendor.calls.slot_id/g' "${2}"
+            sed -i 's/ril.dds.call.slotid/vendor.calls.slotid/g' "${2}"
-            # Pass an empty value to SecRil::RequestComplete in OnGetSmscAddressDone (mov x3,x20 -> mov,x3,#0x0)
+            # Pass an empty value to SecRil::RequestComplete in OnGetSmscAddressDone
-            xxd -p -c0 "${2}" | sed "s/600e40f9820c805224008052e10315aa080040f9e30314aa/600e40f9820c805224008052e10315aa080040f9030080d2/g" | xxd -r -p > "${2}".patched
+            xxd -p -c0 "${2}" | sed "s/600e40f9820c805224008052e10315aae30314aa/600e40f9820c805224008052e10315aa030080d2/g" | xxd -r -p > "${2}".patched
             mv "${2}".patched "${2}"
             ;;
         vendor/lib64/hw/android.hardware.health@2.0-impl-2.1-samsung.so)

proprietary-files.txt

@@ -1,4 +1,4 @@
-# All blobs are from A525FXXS7FXE2 (U), unless pinned
+# All blobs are from A525FXXU6EWL3 (U), unless pinned
 
 # ACDB
 vendor/lib/libacdb-fts.so
@@ -861,28 +861,6 @@ vendor/lib64/libprotobuf-cpp-lite-3.9.1.so
 vendor/etc/public.libraries.txt
 
 # QMI
-vendor/bin/irsc_util
-vendor/bin/pd-mapper
-vendor/bin/qrtr-ns
-vendor/bin/ssr_setup
-vendor/lib/libdsutils.so
-vendor/lib64/libdsutils.so
-vendor/lib/libqmi.so
-vendor/lib64/libqmi.so
-vendor/lib/libqmi_cci.so
-vendor/lib64/libqmi_cci.so
-vendor/lib/libqmi_client_helper.so
-vendor/lib64/libqmi_client_helper.so
-vendor/lib/libqmi_client_qmux.so
-vendor/lib64/libqmi_client_qmux.so
-vendor/lib/libqmi_csi.so
-vendor/lib64/libqmi_csi.so
-vendor/lib/libqmiservices.so
-vendor/lib64/libqmiservices.so
-vendor/lib/libqdi.so
-vendor/lib64/libqdi.so
-vendor/lib/libqdp.so
-vendor/lib64/libqdp.so
 vendor/lib/libdiag.so
 vendor/lib/libdiagjni.so
 vendor/lib/libpdmapper.so
@@ -911,30 +889,6 @@ vendor/etc/sec_config
 vendor/etc/init/init.qti.qcv.rc
 
 # RIL
-vendor/bin/hw/rild
-vendor/bin/adpl
-vendor/bin/ipacm-diag
-vendor/bin/tftp_server
-vendor/bin/rmt_storage
-vendor/etc/init/netmgrd.rc
-vendor/etc/data/dsi_config.xml
-vendor/etc/data/netmgr_config.xml
-vendor/etc/locale/plmn_delta_eng.bin
-vendor/etc/plmn_delta_hktw.bin
-vendor/etc/plmn_se13.bin
-vendor/etc/mtu-conf.xml
-vendor/lib/libconfigdb.so
-vendor/lib64/libconfigdb.so
-vendor/lib/libdsi_netctrl.so
-vendor/lib64/libdsi_netctrl.so
-vendor/lib/libqcmaputils.so
-vendor/lib64/libqcmaputils.so
-vendor/lib64/libengmode_client.so
-vendor/lib64/libsec-ril.so|a5e33da6edd1bfe0b4dc6ae90c6db6a34ea029fb
-vendor/lib64/libsecril-client.so
-vendor/lib64/libril_sem.so
-vendor/lib64/libSemTelephonyProps.so
-vendor/lib64/libSemDataProps.so
 vendor/etc/init/dataadpl.rc
 vendor/etc/init/ipacm-diag.rc
 vendor/etc/init/vendor.qti.tftp.rc
@@ -956,8 +910,70 @@ vendor/lib64/libvkmanager_vendor.so
 vendor/lib/libxml.so
 vendor/lib64/libxml.so
 vendor/lib64/vendor.samsung.hardware.radio.bridge@2.0.so
-vendor/lib64/vendor.samsung.hardware.radio.bridge@2.1.so
+vendor/lib64/vendor.samsung.hardware.radio@2.0.so
 vendor/lib64/vendor.samsung.hardware.radio.channel@2.0.so
+vendor/lib64/vendor.samsung.hardware.radio@2.1.so
+
+# QMI - from A525FXXU4AUJ2
+vendor/bin/irsc_util|c2cb91666e88000df258730cd4a0a81a207a2704
+vendor/bin/pd-mapper|a4e55ee88823aa430b1631c98dc813754d3dc013
+vendor/bin/qrtr-ns|09cff0de46c5d4eb1cd7dfa5b5bdda015e9d7a75
+vendor/bin/ssr_setup|d29b53a3121e9e305eb5a31273d3fb9101d4ffc7
+vendor/lib/libdsutils.so|36cdb350c59799aa0a80f519f96ead7d3ee89973
+vendor/lib64/libdsutils.so|d46085964069785ea6b3bac24a69348ebd47d74c
+vendor/lib/libqmi.so|721c5dc3a64d603d1aa80ee5a0692cccc7ecbdcd
+vendor/lib64/libqmi.so|350b7221e85ac9930af92203aadfa8f785051917
+vendor/lib/libqmi_cci.so|9e6e1f9410034b352a90d3636dbab77e04ac798e
+vendor/lib64/libqmi_cci.so|fe28dceb33e9a3070b19ea394a26245f4cc9bda3
+vendor/lib/libqmi_client_helper.so|71c4f5375645420915c2c4acdfdc82eb7ef92f76
+vendor/lib64/libqmi_client_helper.so|906e317d26ab331745166bc5a42b767c3fa517f8
+vendor/lib/libqmi_client_qmux.so|ed3d7ebdce68a988825e992143333dfa9aede478
+vendor/lib64/libqmi_client_qmux.so|c79a6964a0e4684b45c5340a5fce7a96f3442cc1
+vendor/lib/libqmi_csi.so|f65cbe21c2a8d8e1d375aeacadb1f31d2818497f
+vendor/lib64/libqmi_csi.so|28b7dd8906c028af98500bbab2e912d16fab455f
+vendor/lib/libqmiservices.so|97e8634aafcddc9520b788694dff0e6499ec2d00
+vendor/lib64/libqmiservices.so|33b70e96e031e646758e5d887f1c9d6792e990ab
+vendor/lib/librilqmiservices-ext.so|aeefecff17a9e4f247da67f878667760535cfd8b
+vendor/lib64/librilqmiservices-ext.so|a020dafb8d1932ab90bbcfe362afb93dc74d010d
+vendor/lib/libqdi.so|ba4b20f2c09fff4ffc3a14d4ae9746fa21c52179
+vendor/lib64/libqdi.so|b57089bb6cdb17442b06952bf21f97ee2d4b1f30
+vendor/lib/libqdp.so|738344f32ef0c1372fb1b207232bab22800c20a0
+vendor/lib64/libqdp.so|14b4020c1cb9a04a52742b226913324ef060775b
+
+# RIL - from A525FXXU4AUJ2
+vendor/bin/hw/rild|72c84e72636177fd669be36a6eb8eda63fe270b0
+vendor/bin/adpl|e4b48a55f8b9a8376daf115aace6f19c6289a325
+vendor/bin/ATFWD-daemon|936e1d2b6127c551eabe6bfeeab31c2271bebf02
+vendor/bin/ipacm-diag|aa89edba217878c5ea07b2d9f89a5410078b5f98
+vendor/bin/netmgrd|6871b8c8ceb075ee710654fc2e11eff8e0eef2e1
+vendor/bin/tftp_server|2a13e915980354f803b0dd04c53bf5318bcec173
+vendor/bin/rmt_storage|17f8aa097adc319ef6b9c5caaf5ef267089f2b8d
+vendor/etc/data/dsi_config.xml|ea5973ae0bffbdfbffb84fc2348b260d53b03b02
+vendor/etc/data/netmgr_config.xml|ebd99ffce6bc051ee811478c4f866907cfb80046
+vendor/etc/init/netmgrd.rc|3968aa11ebdebab2b5b53bbea1525e8cd5dfe837
+vendor/etc/locale/plmn_delta_eng.bin|642c0104ac67f587f07fa79ceab34ba43c4522fa
+vendor/etc/plmn_delta_hktw.bin|97a5a4747e8c32d463d8f26254257309b8a03a63
+vendor/etc/plmn_se13.bin|e1961fbbab7d8ef092b76a707b8364ba8c4ef012
+vendor/etc/seccomp_policy/atfwd@2.0.policy|74fdb7d47bdb6d0cb06b13701a96a76c9171ab5d
+vendor/etc/mtu-conf.xml|febe82a2b92265b74e9ceb528f0c9da10a3b51e7
+vendor/lib/libconfigdb.so|d6b7ee43c7cad7e9b1f296a2e9531540c5499f84
+vendor/lib64/libconfigdb.so|1193bbec010e24102caa7974a22cc0dcf0ec6c47
+vendor/lib/libdsi_netctrl.so|3ebe293a1bc3d217ad2c8acf39f4eaf9245c59f5
+vendor/lib64/libdsi_netctrl.so|24cb384cc9b8ca1bc1c0c6f36cfce5d237064bd6
+vendor/lib/libnetmgr.so|72f9fb23851dd6ffe6ac0aabfce5081d69f1839a
+vendor/lib/libnetmgr_common.so|b7987fd703db7688086b10c612e910e445db65a6
+vendor/lib64/libnetmgr.so|527afad81de5394679e6ef4c46e7faf4d03e5419
+vendor/lib64/libnetmgr_common.so|9ffa3e00702aa3db43908cf44af70fb438aa5bd5
+vendor/lib/libqcmaputils.so|287f2558403918db436c39b39fa731ddda2235ee
+vendor/lib64/libqcmaputils.so|7ecfbdbec099854c60a6393ee7f568bedc28989b
+vendor/lib64/libengmode_client.so|a0d931e18a4e81a8de4169a419b187568d042708
+vendor/lib64/libsec-ril.so|5bc6b84fb09f11202d5bb61ca422bae351e9d0c7
+vendor/lib64/libsec-ril-dsds.so|12bc89df6348392265fc240d461dfdba114aa434
+vendor/lib64/libsecril-client.so|c49dbd56d93e00ccb3f008b955e81495573ff313
+vendor/lib/libril.so|b7759521aeb60a07b929e4ff53ba25338c4cd087
+vendor/lib64/libril.so|49d4eebf79faefd03b8378c3ed07cf44730a15ff
+vendor/lib64/liblqe.so|732f3a617a90c2c96b54fe80d0ab2a409b2cb82a
+vendor/lib64/vendor.qti.hardware.radio.atcmdfwd@1.0.so|c6dd375aba54c664e61cf1915477feb01154333f
 
 # Sensors
 vendor/bin/factory.ssc

rootdir/Android.mk

@@ -117,10 +117,10 @@ LOCAL_MODULE_PATH  := $(TARGET_OUT_VENDOR_ETC)/init
 include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
-LOCAL_MODULE       := vendor.samsung.rilchip.qcom.rc
+LOCAL_MODULE       := init.vendor.rilchip.rc
 LOCAL_MODULE_TAGS  := optional
 LOCAL_MODULE_CLASS := ETC
-LOCAL_SRC_FILES    := etc/vendor.samsung.rilchip.qcom.rc
+LOCAL_SRC_FILES    := etc/init.vendor.rilchip.rc
 LOCAL_MODULE_PATH  := $(TARGET_OUT_VENDOR_ETC)/init
 include $(BUILD_PREBUILT)
 

rootdir/etc/init.samsung.rc

@@ -171,7 +171,7 @@ on post-fs
 
 on boot
     # Permissions for Touchscreen
-    chown system system /sys/class/sec/tsp/cmd
+    chown system radio /sys/class/sec/tsp/cmd
     chown system system /sys/class/sec/tsp/input/enabled
     chmod 0660 /sys/class/sec/tsp/input/enabled
     chown system system /sys/class/sec/tsp/enabled

rootdir/etc/init.target.rc

@@ -154,8 +154,6 @@ on boot
     chown cameraserver cameraserver /dev/cpuset/camera-daemon/tasks
     chmod 0660 /dev/cpuset/camera-daemon/tasks
 
-    setprop vendor.powerhal.init 1
-
 #Load WLAN driver
   #  exec_background u:r:vendor_modprobe:s0 -- /vendor/bin/modprobe -a -d /vendor/lib/modules/ qca_cld3_wlan
   # exec_background u:r:vendor_modprobe:s0 -- /vendor/bin/modprobe -a -d /vendor/lib/modules/5.4-gki qca_cld3_wlan

rootdir/etc/init.vendor.rilchip.rc

@@ -11,6 +11,18 @@ service ril-daemon /vendor/bin/hw/rild
     capabilities BLOCK_SUSPEND NET_ADMIN NET_RAW SYS_ADMIN CHOWN SYS_TIME
     socket sap_uim_socket1 stream 660 bluetooth bluetooth
 
+service ril-daemon1 /vendor/bin/hw/rild -c 2
+    class main
+    user radio
+    group radio cache inet misc audio log oem_2901 system drmrpc vpn readproc wakelock net_admin
+    capabilities BLOCK_SUSPEND NET_ADMIN NET_RAW SYS_ADMIN CHOWN SYS_TIME
+
+# QMUX must be in multiple groups to support external process connections
+service qmuxd /vendor/bin/qmuxd
+    class main
+    user root
+    group radio audio bluetooth gps oem_2901
+
 service irsc_util_oem /vendor/bin/irsc_util "/vendor/etc/sec_config_oem"
     class core
     user root
@@ -20,9 +32,6 @@ service irsc_util_oem /vendor/bin/irsc_util "/vendor/etc/sec_config_oem"
 service vendor.ril-daemon /vendor/bin/hw/rild-dummy
     override
 
-service vendor.ril-daemon1 /vendor/bin/hw/rild-dummy
-    override
-
 service vendor.ril-daemon2 /vendor/bin/hw/rild-dummy
     override
 
@@ -36,12 +45,3 @@ service vendor.embmsslServer /vendor/bin/embmsslServer
 
 on property:init.svc.vendor.netmgrd=running && property:ro.vendor.use_data_netmgrd=false
     stop vendor.netmgrd
-
-# To enable QMS logs
-on post-fs-data
-    mkdir /data/vendor/qms_logs 0775 radio system
-    mkdir /data/vendor/qms_logs/main 0775 radio system
-    mkdir /data/vendor/qms_logs/other 0775 radio system
-    mkdir /data/vendor/qms_logs/config 0775 radio system
-    copy /vendor/etc/qms_log_config /data/vendor/qms_logs/config/qms_log_config
-    chmod 0666 /data/vendor/qms_logs/config/qms_log_config

rootdir/etc/init.vendor.rilcommon.rc

@@ -10,7 +10,10 @@
 on post-fs-data
     mkdir /data/vendor/secradio 0770 radio radio
 
-on property:vts.native_server.on=*
+on property:ro.vendor.multisim.simslotcount=1
+    stop ril-daemon1
+
+on property:vts.native_server.on=*    
     setprop vendor.vts.native_server.on ${vts.native_server.on}
 
 service network_config /vendor/bin/secril_config_svc NetworkConfig
@@ -26,10 +29,7 @@ service sim_config /vendor/bin/secril_config_svc SimConfig
     disabled
 
 on fs
-    chown radio radio /mnt/vendor/efs/factory.prop
-    chmod 0600 /mnt/vendor/efs/factory.prop
     exec_start sim_config
 
 on post-fs-data
     exec_start network_config
-    setprop ro.telephony.default_network ${ro.vendor.radio.default_network}

rootdir/etc/init.vendor.sensors.rc

@@ -177,7 +177,7 @@ on boot
     chown system radio /sys/class/sensors/light_sensor/read_copr
     chown system radio /sys/class/sensors/light_sensor/boled_enable
     chown system radio /sys/class/sensors/light_sensor/hallic_info
-    chown system system /sys/class/sensors/light_sensor/lcd_onoff
+    chown system radio /sys/class/sensors/light_sensor/lcd_onoff
     chown system radio /sys/class/sensors/light_sensor/sensorhub_ddi_spi_check
     chown system radio /sys/class/sensors/light_sensor/light_cal
     chown system radio /sys/class/sensors/light_sensor/set_aod_rect

rootdir/etc/ueventd.qcom.rc

@@ -398,9 +398,6 @@ firmware_directories /vendor/firmware_mnt/image/ /vendor/firmware-modem/image/
 /sys/class/dual_role_usb/*	power_role	0660	system	system
 /sys/class/dual_role_usb/*	mode		0660	system	system
 
-#permissions secure_lock
-/sys/class/usb_notify/usb_control   usb_sl      0664     system        usb
-
 #Memory Offline
 /sys/devices/system/memory/memory* state    0660 system system
 

rootdir/etc/wifi_sec.rc

@@ -37,10 +37,9 @@ on post-fs-data
     chmod 0640 /sys/wifi/feature
 
     # for WIFI MAC
-    mkdir /mnt/vendor/efs/wifi 0775 system wifi
+    mkdir /mnt/vendor/efs/wifi 0755 wifi wifi
-    chmod 0775 /mnt/vendor/efs/wifi
+    chown wifi wifi /mnt/vendor/efs/wifi/.mac.info
-    chown system wifi /mnt/vendor/efs/wifi/.mac.info
+    chmod 0644 /mnt/vendor/efs/wifi/.mac.info
-    chmod 0664 /mnt/vendor/efs/wifi/.mac.info
     chown wifi wifi /mnt/vendor/efs/wifi/.mac.cob
     chmod 0644 /mnt/vendor/efs/wifi/.mac.cob
     chown wifi wifi /sys/wifi/mac_addr

sepolicy/private/audio_parameter_service.te

@@ -0,0 +1,8 @@
+type audio_parameter_service, domain, coredomain;
+type audio_parameter_service_exec, system_file_type, exec_type, file_type;
+
+init_daemon_domain(audio_parameter_service)
+
+hal_client_domain(audio_parameter_service, hal_audio)
+
+set_prop(audio_parameter_service, vendor_call_prop)

sepolicy/private/file_contexts

@@ -0,0 +1 @@
+/(system_ext|system/system_ext)/bin/audio_parameter_service.samsung_sm7125                                                u:object_r:audio_parameter_service_exec:s0

sepolicy/public/property.te

@@ -0,0 +1 @@
+system_public_prop(vendor_call_prop)

sepolicy/vendor/file_contexts

@@ -53,7 +53,7 @@
 /(vendor|system/vendor)/bin/hw/android\.hardware\.camera\.provider@2\.5-service\.samsung                    u:object_r:hal_camera_default_exec:s0
 /(vendor|system/vendor)/bin/hw/android\.hardware\.drm@[0-9]\.[0-9]-service\.widevine                        u:object_r:hal_drm_widevine_exec:s0
 /(vendor|system/vendor)/bin/hw/android\.hardware\.keymaster@[0-9]\.[0-9]-service\.samsung                   u:object_r:hal_keymaster_default_exec:s0
-/(vendor|system/vendor)/bin/hw/android\.hardware\.power(@[0-9]\.[0-9])?-service\.pixel-libperfmgr           u:object_r:hal_power_default_exec:s0
+/(vendor|system/vendor)/bin/hw/android\.hardware\.power(@[0-9]\.[0-9])?-service\.samsung-libperfmgr         u:object_r:hal_power_default_exec:s0
 /(vendor|system/vendor)/bin/hw/android\.hardware\.nfc@[0-9]\.[0-9]-service\.samsung                         u:object_r:hal_nfc_default_exec:s0
 /(vendor|system/vendor)/bin/hw/vendor\.lineage\.fastcharge@[0-9]\.[0-9]-service\.samsung                    u:object_r:hal_lineage_fastcharge_default_exec:s0
 /(vendor|system/vendor)/bin/hw/vendor\.lineage\.touch\@[0-9]\.[0-9]-service.sm7125                          u:object_r:hal_lineage_touch_default_exec:s0
@@ -64,4 +64,3 @@
 /(vendor|system/vendor)/bin/hw/android.hardware.sensors-service.samsung-multihal                            u:object_r:hal_sensors_default_exec:s0
 /(vendor|system/vendor)/bin/hw/android\.hardware\.vibrator\-service\.samsung                                u:object_r:hal_vibrator_default_exec:s0
 /(vendor|system/vendor)/bin/hw/android\.hardware\.health@2\.1-service-samsung                               u:object_r:hal_health_default_exec:s0
-/(vendor|system/vendor)/bin/hw/sehradiomanager                                                              u:object_r:sehradiomanager_exec:s0

sepolicy/vendor/hal_audio_default.te

@@ -6,4 +6,4 @@ allow hal_audio_default imei_efs_file:file { read open getattr };
 
 allow hal_audio_default efs_file:dir search;
 
-get_prop(hal_audio_default, vendor_radio_prop)
+get_prop(hal_audio_default, vendor_call_prop)

sepolicy/vendor/property_contexts

@@ -22,7 +22,8 @@ vendor.sec.rild.                                 u:object_r:vendor_radio_prop:s0
 ro.vendor.sec.radio.                             u:object_r:vendor_radio_prop:s0
 ro.vendor.use_data_netmgrd                       u:object_r:vendor_radio_prop:s0
 ro.vendor.epdg.support                           u:object_r:vendor_radio_prop:s0
-vendor.calls                                     u:object_r:vendor_radio_prop:s0
+
+vendor.calls                                     u:object_r:vendor_call_prop:s0
 
 # Sensors
 vendor.sensor.file.permission                    u:object_r:vendor_sensors_prop:s0

sepolicy/vendor/rild.te

@@ -3,6 +3,8 @@
 get_prop(rild, vendor_radio_prop)
 get_prop(rild, radio_prop)
 
+set_prop(rild, vendor_call_prop)
+
 allow rild block_device:dir search;
 allow rild mnt_vendor_file:dir { getattr search };
 

sepolicy/vendor/sehradiomanager.te

@@ -1,13 +0,0 @@
-# sehradiomanager.te
-
-type sehradiomanager, domain;
-type sehradiomanager_exec, exec_type, file_type, vendor_file_type;
-
-init_daemon_domain(sehradiomanager)
-
-get_prop(sehradiomanager, vendor_radio_prop)
-get_prop(sehradiomanager, hwservicemanager_prop)
-binder_call(sehradiomanager, hwservicemanager)
-binder_call(sehradiomanager, servicemanager)
-binder_call(servicemanager, sehradiomanager)
-hal_client_domain(sehradiomanager, hal_telephony)

sepolicy/vendor/service_contexts

@@ -1,14 +0,0 @@
-vendor.samsung.hardware.radio.bridge.ISehRadioBridge/slot1          u:object_r:hal_radio_service:s0
-vendor.samsung.hardware.radio.bridge.ISehRadioBridge/slot2          u:object_r:hal_radio_service:s0
-vendor.samsung.hardware.radio.channel.ISehRadioChannel/epdgd        u:object_r:hal_radio_service:s0
-vendor.samsung.hardware.radio.channel.ISehRadioChannel/epdgd2       u:object_r:hal_radio_service:s0
-vendor.samsung.hardware.radio.channel.ISehRadioChannel/imsd         u:object_r:hal_radio_service:s0
-vendor.samsung.hardware.radio.channel.ISehRadioChannel/imsd2        u:object_r:hal_radio_service:s0
-vendor.samsung.hardware.radio.data.ISehRadioData/slot1              u:object_r:hal_radio_service:s0
-vendor.samsung.hardware.radio.data.ISehRadioData/slot2              u:object_r:hal_radio_service:s0
-vendor.samsung.hardware.radio.messaging.ISehRadioMessaging/slot1    u:object_r:hal_radio_service:s0
-vendor.samsung.hardware.radio.messaging.ISehRadioMessaging/slot2    u:object_r:hal_radio_service:s0
-vendor.samsung.hardware.radio.network.ISehRadioNetwork/slot1        u:object_r:hal_radio_service:s0
-vendor.samsung.hardware.radio.network.ISehRadioNetwork/slot2        u:object_r:hal_radio_service:s0
-vendor.samsung.hardware.radio.sim.ISehRadioSim/slot1                u:object_r:hal_radio_service:s0
-vendor.samsung.hardware.radio.sim.ISehRadioSim/slot2                u:object_r:hal_radio_service:s0

vendor.prop

@@ -175,11 +175,9 @@ debug.stagefright.ccodec=1
 # Perf
 ro.vendor.extension_library=libqti-perfd-client.so
 
-# Power HAL
-vendor.powerhal.disp.idle_support=false
-
 # RIL
 vendor.sec.rild.libpath=/vendor/lib64/libsec-ril.so
+vendor.sec.rild.libpath2=/vendor/lib64/libsec-ril-dsds.so
 persist.vendor.radio.atfwd.start=true
 ro.vendor.sec.radio.def_network=9
 persist.vendor.radio.enableadvancedscan=true