From 08dc7018479ba53b2d50e1532c21616626f9b0a7 Mon Sep 17 00:00:00 2001 From: Karsten Tausche Date: Wed, 5 Oct 2022 10:32:42 +0200 Subject: [PATCH 1/5] Disable proprietary 3GP parser The proprietary parser has security issues and won't receive updates anymore on the msm8953 platform. Unset bit 8 of the bitmask to disable it and fall back to AOSP parsers. Issue: FP3SEC-411 Issue: FP3-A11#411 Change-Id: Ie8d37c0c962975e8e6b0f88bece28bf4eb881bc0 --- system.prop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system.prop b/system.prop index f72734ac..43ce238e 100644 --- a/system.prop +++ b/system.prop @@ -83,7 +83,7 @@ media.aac_51_output_enabled=true av.debug.disable.pers.cache=1 #media.settings.xml=/vendor/etc/media_profiles_vendor.xml # codecs:(PARSER_)AAC AC3 AMR_NB AMR_WB ASF DTS FLV 3GP 3G2 MP2PS MP2TS MP3 OGG QCP WAV FLAC AIFF -vendor.mm.enable.qcom_parser=523231 +vendor.mm.enable.qcom_parser=522975 # disable PQ feature by default vendor.vidc.enc.disable.pq=true # property to enable narrow search range for video encoding -- GitLab From 016c163bc8f01dcef4c671b3fb9ca3587cbc6662 Mon Sep 17 00:00:00 2001 From: Karsten Tausche Date: Mon, 17 Oct 2022 12:35:00 +0200 Subject: [PATCH 2/5] Switch to more AOSP-supported media parsers Disable following Qualcomm proprietary media parsers: * AMR NB/WB * MP3 * OGG * WAV * FLAC They have good support in AOSP directly. The proprietary parsers for FP3 have limited support; so rely on the well-maintained open source variants instead. Take only AOSP parsers that are part of the official Android docs/requirements; don't check for further optional support (yet). Issue: FP3-A11#412 Change-Id: Ie573aebd5438891063ca590c03f68a12ec1b8d54 --- system.prop | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system.prop b/system.prop index 43ce238e..749535e9 100644 --- a/system.prop +++ b/system.prop @@ -82,8 +82,8 @@ mmp.enable.3g2=true media.aac_51_output_enabled=true av.debug.disable.pers.cache=1 #media.settings.xml=/vendor/etc/media_profiles_vendor.xml -# codecs:(PARSER_)AAC AC3 AMR_NB AMR_WB ASF DTS FLV 3GP 3G2 MP2PS MP2TS MP3 OGG QCP WAV FLAC AIFF -vendor.mm.enable.qcom_parser=522975 +#codecs:(PARSER_)AAC AC3 ASF DTS FLV 3G2 MP2PS MP2TS QCP AIFF +vendor.mm.enable.qcom_parser=301779 # disable PQ feature by default vendor.vidc.enc.disable.pq=true # property to enable narrow search range for video encoding -- GitLab From 90555f3f6cf34b4b87432d126f1f6371bb8b0247 Mon Sep 17 00:00:00 2001 From: Karsten Tausche Date: Wed, 9 Nov 2022 17:05:29 +0100 Subject: [PATCH 3/5] Disable proprietary DTS parser The proprietary parser has security issues and won't receive updates anymore on the msm8953 platform. Unset bit 6 of the bitmask to disable it and drop DTS support. Issue: FP3SEC-405 Issue: FP3-A11#435 Change-Id: I5eb69d99b8fd50adef3d1dc176afd93e03c7ddb1 --- system.prop | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system.prop b/system.prop index 749535e9..ae61a0f8 100644 --- a/system.prop +++ b/system.prop @@ -82,8 +82,8 @@ mmp.enable.3g2=true media.aac_51_output_enabled=true av.debug.disable.pers.cache=1 #media.settings.xml=/vendor/etc/media_profiles_vendor.xml -#codecs:(PARSER_)AAC AC3 ASF DTS FLV 3G2 MP2PS MP2TS QCP AIFF -vendor.mm.enable.qcom_parser=301779 +#codecs:(PARSER_)AAC AC3 ASF FLV 3G2 MP2PS MP2TS QCP AIFF +vendor.mm.enable.qcom_parser=301715 # disable PQ feature by default vendor.vidc.enc.disable.pq=true # property to enable narrow search range for video encoding -- GitLab From 9f14db899e8fb79e473b2131365393e6167b8c51 Mon Sep 17 00:00:00 2001 From: Bharath Date: Mon, 19 Dec 2022 13:04:58 +0530 Subject: [PATCH 4/5] FP3: Drop some proprietary components from the build Following seem to be incompatible on Android 12: * com.qualcomm.qti.services.secureui * com.qualcomm.qti.services.systemhelper * ConnectionSecurityService and TrustZoneAccessService Drop these modules and corresponding libraries. Additionally, drop the following as they are no longer used: * SimSettings * NetworkSetting * QCC - this is just an Analytics service which is optional. Change-Id: Ic23f859fd34f6e245dbd1acaa3c18ccdbdaaa96c --- proprietary-files.txt | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/proprietary-files.txt b/proprietary-files.txt index 759c2193..68879566 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -111,13 +111,9 @@ product/etc/permissions/vendor.qti.hardware.data.connection-V1.1-java.xml -system_ext/app/ConferenceDialer/ConferenceDialer.apk -system_ext/app/DeviceInfo/DeviceInfo.apk -system_ext/app/DynamicDDSService/DynamicDDSService.apk --system_ext/app/NetworkSetting/NetworkSetting.apk --system_ext/app/QCC-AUTHMGR/QCC-AUTHMGR.apk --system_ext/app/QCC/QCC.apk -system_ext/app/QtiTelephonyService/QtiTelephonyService.apk -system_ext/app/SimContact/SimContact.apk -system_ext/app/atfwd/atfwd.apk --system_ext/app/com.qualcomm.qti.services.secureui/com.qualcomm.qti.services.secureui.apk -system_ext/app/datastatusnotification/datastatusnotification.apk -system_ext/app/embms/embms.apk -system_ext/app/imssettings/imssettings.apk @@ -299,8 +295,6 @@ system_ext/lib/libseccam-ipc.so system_ext/lib/libseccam.so system_ext/lib/libseccamservice.so system_ext/lib/libsecureui_svcsock_system.so -system_ext/lib/libsecureuisvc_jni.so -system_ext/lib/libsystemhelper_jni.so system_ext/lib/libvr_amb_engine.so system_ext/lib/libvr_object_engine.so system_ext/lib/vendor.display.color@1.0.so @@ -463,8 +457,6 @@ system_ext/lib64/libseccam-ipc.so system_ext/lib64/libseccam.so system_ext/lib64/libseccamservice.so system_ext/lib64/libsecureui_svcsock_system.so -system_ext/lib64/libsecureuisvc_jni.so -system_ext/lib64/libsystemhelper_jni.so system_ext/lib64/libvr_amb_engine.so system_ext/lib64/libvr_object_engine.so system_ext/lib64/vendor.display.color@1.0.so @@ -564,7 +556,6 @@ system_ext/lib64/vendor.qti.voiceprint@1.0.so # priv-app -system_ext/priv-app/QAS_DVC_MSP/QAS_DVC_MSP.apk --system_ext/priv-app/com.qualcomm.qti.services.systemhelper/com.qualcomm.qti.services.systemhelper.apk -system_ext/priv-app/dpmserviceapp/dpmserviceapp.apk -system_ext/priv-app/ims/ims.apk -system_ext/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk @@ -576,10 +567,8 @@ system_ext/lib64/vendor.qti.voiceprint@1.0.so # app -vendor/app/CACertService/CACertService.apk -vendor/app/CneApp/CneApp.apk --vendor/app/ConnectionSecurityService/ConnectionSecurityService.apk -vendor/app/IWlanService/IWlanService.apk -vendor/app/TimeService/TimeService.apk --vendor/app/TrustZoneAccessService/TrustZoneAccessService.apk # bin vendor/bin/ATFWD-daemon -- GitLab From e7a637d118975d528a5a62bcca45814ddae3d6e2 Mon Sep 17 00:00:00 2001 From: Bharath Date: Mon, 19 Dec 2022 13:08:49 +0530 Subject: [PATCH 5/5] FP3: Update blobs from FP3-REL-8901.4.A.0019.1-gms-edfd6a4e-user Change-Id: I7e027c0c75beac8b6f2147b20c21f5983a66ca84 --- BoardConfig.mk | 2 +- lineage_FP3.mk | 4 ++-- proprietary-files.txt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/BoardConfig.mk b/BoardConfig.mk index c7e62ec0..bb5cc832 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -238,7 +238,7 @@ TARGET_PER_MGR_ENABLED := true TARGET_RECOVERY_FSTAB := $(DEVICE_PATH)/rootdir/etc/recovery.fstab # Vendor Security Patch Level -VENDOR_SECURITY_PATCH := "2022-10-05" +VENDOR_SECURITY_PATCH := "2022-12-05" # NFC BOARD_NFC_CHIPSET := pn553 diff --git a/lineage_FP3.mk b/lineage_FP3.mk index 2411cf27..a93437bc 100644 --- a/lineage_FP3.mk +++ b/lineage_FP3.mk @@ -37,7 +37,7 @@ PRODUCT_GMS_CLIENTID_BASE := android-uniscope # userdebug PRODUCT_BUILD_PROP_OVERRIDES += \ TARGET_DEVICE=FP3 \ - PRIVATE_BUILD_DESC="FP3-user 11 8901.4.A.0017.3-gms-15368f27 release-keys" + PRIVATE_BUILD_DESC="FP3-user 11 8901.4.A.0019.1-gms-edfd6a4e release-keys" # Set BUILD_FINGERPRINT variable to be picked up by both system and vendor build.prop -BUILD_FINGERPRINT := Fairphone/FP3/FP3:11/8901.4.A.0017.3/gms-15368f27:user/release-keys +BUILD_FINGERPRINT := Fairphone/FP3/FP3:11/8901.4.A.0019.1/gms-edfd6a4e:user/release-keys diff --git a/proprietary-files.txt b/proprietary-files.txt index 68879566..d3ec2845 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -1,4 +1,4 @@ -# All unpinned blobs are extracted from FP3-REL-8901.4.A.0017.3-gms-15368f27-user +# All unpinned blobs are extracted from FP3-REL-8901.4.A.0019.1-gms-edfd6a4e-user # System partition -- GitLab