From ad4ed687f760e98d8be96591c66b6e3c89c7082d Mon Sep 17 00:00:00 2001 From: Simon1511 Date: Fri, 5 Jan 2024 17:20:59 +0100 Subject: [PATCH] sm7125-common: libsec-ril: Always return an empty value for GET_SMSC_ADDRESS * Make parameter of type RilData (second last one) passed to SecRil::RequestComplete() in OnGetSmscAddressDone() be NULL, so that the framework passes an empty value when sending SMS * Before U this value was not being used, on U the value returned is "SMSC",format_specifier which is considered invalid when passed back to RIL for sending SMS, however when an empty value is passed RIL will select the default SMSC, like it did on T and sending SMS works again Change-Id: I608be406969d7fa58f15ef36340aff4ad1ce9fd0 Co-authored-by: Tim Zimmermann --- extract-files.sh | 9 +++++---- proprietary-files.txt | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/extract-files.sh b/extract-files.sh index 3f28516..c3ee619 100755 --- a/extract-files.sh +++ b/extract-files.sh @@ -60,11 +60,12 @@ fi function blob_fixup() { case "${1}" in - vendor/lib64/libsec-ril.so) - sed -i 's/ril.dds.call.slotid/vendor.calls.slotid/g' "${2}" - ;; - vendor/lib64/libsec-ril-dsds.so) + vendor/lib64/libsec-ril.so|vendor/lib64/libsec-ril-dsds.so) + # Replace SlotID prop sed -i 's/ril.dds.call.slotid/vendor.calls.slotid/g' "${2}" + # Pass an empty value to SecRil::RequestComplete in OnGetSmscAddressDone + 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) # Replace libutils with vndk30 libutils diff --git a/proprietary-files.txt b/proprietary-files.txt index c5265f9..959ac27 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -967,8 +967,8 @@ 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|83ec3554c733543d75148a045f51385868f308ad -vendor/lib64/libsec-ril-dsds.so|bf3d12e806e343082aa2842517b45415d5b70498 +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