From 10f4e0394388c39e9cc8e3220e998d413aba1cf8 Mon Sep 17 00:00:00 2001 From: Marc Bourgoin Date: Wed, 31 Jan 2024 21:56:08 -0700 Subject: [PATCH] rtwo: Update blobs from rtwo RETAIL 14 We will still pin a few CarrierSettings from RETCN 14 Change-Id: Ic279c837d319f22285e338e907e097a3cefbc374 --- BoardConfig.mk | 16 ++----- lineage_rtwo.mk | 20 ++------ proprietary-files-carriersettings.txt | 36 +++++++++------ proprietary-files.txt | 66 +++++++++++++-------------- 4 files changed, 63 insertions(+), 75 deletions(-) diff --git a/BoardConfig.mk b/BoardConfig.mk index f79594a..0007c8c 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -1,17 +1,7 @@ # -# Copyright (C) 2022 The LineageOS Project +# Copyright (C) 2022-2024 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. +# SPDX-License-Identifier: Apache-2.0 # DEVICE_PATH := device/motorola/rtwo @@ -109,7 +99,7 @@ TARGET_VENDOR_PROP += $(DEVICE_PATH)/vendor.prop TARGET_RECOVERY_UI_MARGIN_HEIGHT := 90 # Security -VENDOR_SECURITY_PATCH := 2023-11-01 +VENDOR_SECURITY_PATCH := 2024-01-01 # inherit from the proprietary version include vendor/motorola/rtwo/BoardConfigVendor.mk diff --git a/lineage_rtwo.mk b/lineage_rtwo.mk index b96aa10..ec28746 100644 --- a/lineage_rtwo.mk +++ b/lineage_rtwo.mk @@ -1,17 +1,7 @@ # -# Copyright (C) 2022 The LineageOS Project +# Copyright (C) 2022-2024 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. +# SPDX-License-Identifier: Apache-2.0 # # Inherit from those products. Most specific first. @@ -33,7 +23,7 @@ PRODUCT_MODEL := motorola edge 40 pro PRODUCT_GMS_CLIENTID_BASE := android-motorola PRODUCT_BUILD_PROP_OVERRIDES += \ - TARGET_PRODUCT=rtwo_cn \ - PRIVATE_BUILD_DESC="rtwo_cn-user 14 U1TR34.8-19-2 9bfa3-adc28 release-keys" + TARGET_PRODUCT=rtwo_g \ + PRIVATE_BUILD_DESC="rtwo_g-user 14 U1TR34.8-30-13 c6cfc-4ed033 release-keys" -BUILD_FINGERPRINT := motorola/rtwo_cn/msi:14/U1TR34.8-19-2/9bfa3-adc28:user/release-keys +BUILD_FINGERPRINT := motorola/rtwo_g/msi:14/U1TR34.8-30-13/c6cfc-4ed033:user/release-keys diff --git a/proprietary-files-carriersettings.txt b/proprietary-files-carriersettings.txt index b47a265..30269b9 100644 --- a/proprietary-files-carriersettings.txt +++ b/proprietary-files-carriersettings.txt @@ -1,4 +1,6 @@ # All unpinned blobs below are extracted from the release mentioned in proprietary-files.txt + +# CarrierSettings product/etc/CarrierSettings/carrier_list.pb product/etc/CarrierSettings/others.pb product/etc/CarrierSettings/s001001imsi_3d__5e_001001_2e__2a_.pb @@ -45,9 +47,11 @@ product/etc/CarrierSettings/s20416gid1_3d_ff.pb product/etc/CarrierSettings/s20416.pb product/etc/CarrierSettings/s20416spn_3d_ben_20_nl.pb product/etc/CarrierSettings/s20416spn_3d_ben.pb +product/etc/CarrierSettings/s20416spn_3d_simpel_20_nl.pb product/etc/CarrierSettings/s20416spn_3d_simpel.pb product/etc/CarrierSettings/s20416spn_3d_t_2d_mobile_20_nl.pb product/etc/CarrierSettings/s20416spn_3d_tele2_20_nl.pb +product/etc/CarrierSettings/s20417.pb product/etc/CarrierSettings/s20433.pb product/etc/CarrierSettings/s20465gid1_3d_50.pb product/etc/CarrierSettings/s20601gid1_3d_28.pb @@ -132,6 +136,8 @@ product/etc/CarrierSettings/s20826.pb product/etc/CarrierSettings/s20827.pb product/etc/CarrierSettings/s20827spn_3d_coriolis.pb product/etc/CarrierSettings/s20835.pb +product/etc/CarrierSettings/s20838.pb +product/etc/CarrierSettings/s20838spn_3d_lebara.pb product/etc/CarrierSettings/s20888.pb product/etc/CarrierSettings/s21401.pb product/etc/CarrierSettings/s21402.pb @@ -149,6 +155,7 @@ product/etc/CarrierSettings/s21403spn_3d_racc.pb product/etc/CarrierSettings/s21403spn_3d_simyo.pb product/etc/CarrierSettings/s21403spn_3d_virgin_20_telco.pb product/etc/CarrierSettings/s21404imsi_3d_2140423.pb +product/etc/CarrierSettings/s21404imsi_3d_2140426.pb product/etc/CarrierSettings/s21404.pb product/etc/CarrierSettings/s21404spn_3d_cablemovil.pb product/etc/CarrierSettings/s21404spn_3d_guuk.pb @@ -516,6 +523,7 @@ product/etc/CarrierSettings/s24681.pb product/etc/CarrierSettings/s24701.pb product/etc/CarrierSettings/s24702.pb product/etc/CarrierSettings/s24705.pb +product/etc/CarrierSettings/s24710.pb product/etc/CarrierSettings/s24801imsi_3d_248010x2.pb product/etc/CarrierSettings/s24801imsi_3d_248010x3.pb product/etc/CarrierSettings/s24801.pb @@ -797,6 +805,7 @@ product/etc/CarrierSettings/s302220gid1_3d_6836.pb product/etc/CarrierSettings/s302220gid1_3d_6838.pb product/etc/CarrierSettings/s302220gid1_3d_7330.pb product/etc/CarrierSettings/s302220gid1_3d_7530.pb +product/etc/CarrierSettings/s302220spn_3d_wom.pb product/etc/CarrierSettings/s302221gid1_3d_4b4f.pb product/etc/CarrierSettings/s302221gid1_3d_4d4f.pb product/etc/CarrierSettings/s302221gid1_3d_5043.pb @@ -3071,16 +3080,17 @@ product/etc/CarrierSettings/s90137.pb product/etc/CarrierSettings/s90143.pb product/etc/CarrierSettings/s90158.pb -# CarrierSettings - from motorola/rtwo_g/msi:13/T1TRS33.43-48-41-3/ac9a4-9767e:user/release-keys -product/etc/CarrierSettings/s20404spn_3d_c_20_spire_20_.pb|7b074d1dc0800baef0f5f24acc8bc467db59cb99 -product/etc/CarrierSettings/s21403spn_3d_orange.pb|127c822d108765530395fdb0d17f64171d9302e8 -product/etc/CarrierSettings/s21404imsi_3d_2140426xxxxxxxx.pb|fc605689d3ac6a7336ba849674c19bb1b84a0815 -product/etc/CarrierSettings/s24006spn_3d_vimla.pb|582c3069166a80d825e87b1b2e7cb25cac6b80ce -product/etc/CarrierSettings/s26207imsi_3d_2620739xxxxxxxx.pb|5638e57f90a034519caaae7b666ea442014f20de -product/etc/CarrierSettings/s26207imsi_3d_2620749xxxxxxxx.pb|f9e0a3dda8c7efffd332595e701873e4948b594e -product/etc/CarrierSettings/s302220spn_3d_wom_20_roaming_20_int.pb|7c8aca3e311d3abf43023b5b1a29556282e47181 -product/etc/CarrierSettings/s310410gid1_3d_3436_20__20__20__20__20__20__20__20__20__20__20__20__20__20__20__20__20__20__20__20__20_.pb|1dd84de5a216be1f986531f02735ecec2498bf65 -product/etc/CarrierSettings/s310410gid1_3d_3442_20__20__20__20__20__20__20__20__20__20__20__20__20__20__20__20__20__20__20__20__20_.pb|40814e6149193ac64d89813cac8105ec62c7d31f -product/etc/CarrierSettings/s310410gid1_3d_3448_20__20__20__20__20__20__20__20__20__20__20__20__20__20__20__20__20__20__20__20__20_.pb|d91cd40c1772c4a9f6dbfdc306912f4f4a1b71a6 -product/etc/CarrierSettings/s311480gid1_3d_b100000000000000.pb|c4610adf0b06dc6306afa9a07922c9a747decd9a -product/etc/CarrierSettings/s53005imsi_3d_53005204.pb|4babfed96141650aa1fad582bc2c514204bca719 +# CarrierSettings - from motorola/rtwo_cn/rtwo:14/U1TR34.8-19-11/a7b98-bf32f9:user/release-keys - RETCN variant +product/etc/CarrierSettings/s46000.pb|d4598c87240639b825593499e0087570ba3cec83 +product/etc/CarrierSettings/s46001.pb|2453d0eed8fe75d88fe016b8f4014177be832cdb +product/etc/CarrierSettings/s46002.pb|7d0716c4cd99556e4b98cfd0e1baa51e46986a61 +product/etc/CarrierSettings/s46003.pb|bb7a77214a3dd73165535822ccf353613cb7cdde +product/etc/CarrierSettings/s46004.pb|ea909f134e9b1e099ce83cd79810d7a8dbca8ac6 +product/etc/CarrierSettings/s46006.pb|cf0b9ff32827557a0d92a32697552b587f490248 +product/etc/CarrierSettings/s46007.pb|53a9bc90e0261b98aa01782290661349db1bce58 +product/etc/CarrierSettings/s46008.pb|8ca963d8b4ea79d6e85ba40050e89fdb6685677c +product/etc/CarrierSettings/s46009.pb|b43d8b14a5f978f6072f0f324bf8230f32e06aac +product/etc/CarrierSettings/s46011.pb|e4efaa6b278486cf659677b6844bf466fea79c9c +product/etc/CarrierSettings/s46012.pb|b54fad0e0f32ab4e7fc417360d773d445db04d6b +product/etc/CarrierSettings/s46013.pb|5a19bda57268a8e0f549535998733657c211a866 +product/etc/CarrierSettings/s46015.pb|1b26cf530f272c49c0b0256d8200dc156fe30017 diff --git a/proprietary-files.txt b/proprietary-files.txt index afd9229..6faaba2 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -1,4 +1,4 @@ -# All unpinned blobs below are extracted from rtwo_retcn-user 14 U1TR43.8-19-2 9bfa3-adc28 release-keys. +# All unpinned blobs below are extracted from rtwo_g-user 14 U1TR34.8-30-13 c6cfc-4ed033 release-keys - RETAIL variant. # ACDB Data vendor/etc/acdbdata/ffv_models/ffv__5.0.1_0.1__3.0.0_0.0__eai_2.10_enpu3.pmd @@ -570,10 +570,10 @@ vendor/etc/display/qdcm_calib_data_mipi_mot_video_dummy_qhd.json # Dolby vision vendor/etc/dolby_vision.cfg -# eUICC - from motorola/rtwo_g/msi:13/T1TRS33.43-48-41-3/ac9a4-9767e:user/release-keys -product/app/EuiccPartnerApp/EuiccPartnerApp.apk|134967f91e11db5da58faff4a0bb862bda2bb1a1 -product/etc/permissions/privapp-permissions-com.google.android.euicc.xml|ef99fe93aa2ed629fef39c3dcc4b07c597c1f469 -product/priv-app/EuiccGoogle/EuiccGoogle.apk|e1f63b736410953ccf7591cfc3813e0360a9dfa4 +# eUICC +product/app/EuiccPartnerApp/EuiccPartnerApp.apk +product/etc/permissions/privapp-permissions-com.google.android.euicc.xml +product/priv-app/EuiccGoogle/EuiccGoogle.apk # Fingerprint vendor/bin/hw/android.hardware.biometrics.fingerprint@2.1-goodixservice @@ -583,37 +583,35 @@ vendor/lib64/hw/fingerprint.goodix.so vendor/lib64/libgf_hal.so vendor/lib64/vendor.goodix.hardware.biometrics.fingerprint@2.1_vendor.so -# HotwordEnrollment - from motorola/rtwo_g/msi:13/T1TRS33.43-48-41-3/ac9a4-9767e:user/release-keys -product/priv-app/HotwordEnrollmentOKGoogleHEXAGON_WIDEBAND/HotwordEnrollmentOKGoogleHEXAGON_WIDEBAND.apk|6a060ccfd9f867f3e09fae09dff6f2d9201fe452 -product/priv-app/HotwordEnrollmentXGoogleHEXAGON_WIDEBAND/HotwordEnrollmentXGoogleHEXAGON_WIDEBAND.apk|ae98926e4620b4108a22127d355be9f44c1e782e -system_ext/etc/permissions/com.android.hotwordenrollment.common.util.xml|99cfd80965c170f4885a7dd62c0eaad1a0c7840f -system_ext/framework/com.android.hotwordenrollment.common.util.jar|a418f5697951468fb93788b6e92d2912e7ae7149 +# HotwordEnrollment +product/priv-app/HotwordEnrollmentOKGoogleHEXAGON_WIDEBAND/HotwordEnrollmentOKGoogleHEXAGON_WIDEBAND.apk +product/priv-app/HotwordEnrollmentXGoogleHEXAGON_WIDEBAND/HotwordEnrollmentXGoogleHEXAGON_WIDEBAND.apk +system_ext/etc/permissions/com.android.hotwordenrollment.common.util.xml +system_ext/framework/com.android.hotwordenrollment.common.util.jar -# MotCamera4 - from motorola/rtwo_g/msi:13/T1TRS33.43-48-41-3/ac9a4-9767e:user/release-keys -product/app/MotCamera3AI/MotCamera3AI.apk;PRESIGNED|6f2c48d2cdf1de43471401dc54934faeb05265d2 -product/etc/permissions/com.motorola.camera3.xml|0d383cbc8f265d80e4f08c9bb9ecefe321a29a7d -product/etc/permissions/deviceowner-configuration-com.motorola.camera3.xml|7df06ec01397dfba8860c84f71805b0895d14087 -product/etc/permissions/privapp-permissions-com.motorola.camera3.xml|b759bdaf7baca0dcc8ee5e1d1faf51c78d43c4a1 -product/etc/sysconfig/hiddenapi-whitelist-com.motorola.camera3.xml|d99de1fb201aa63d9d543a41104013989fc84dc9 -product/priv-app/MotCamera4/MotCamera4.apk;PRESIGNED|701a23eae2b51d9b73bd47127ffbf5eb3eefc406 -system/app/MotoSignatureApp/MotoSignatureApp.apk;PRESIGNED|315d0e5dc4565a046e4119fe203ab951f5e1cd72 -system/etc/permissions/com.motorola.motosignature.xml|657458b1f279e2158db87925dcd518d48f9afcf7 -system/etc/permissions/moto-core_services.xml|e04036b61adefe98f1e59e47e479d41e695ba94e -system/etc/permissions/moto-settings.xml|32f6aeb6f8e9211542bf843ba106acc7ab7c2839 -system/framework/com.motorola.motosignature.jar|3b05b367afffd9b96031aba2b26dc3d24397c73a -system/framework/moto-core_services.jar|1936fbbe645789c41a2fea3edc795e472063b405 -system/framework/moto-settings.jar|02fb105b6476b1e405a9527b8993347f00419213 -system_ext/bin/motsettings|629acaf083fb5fb9ea171c8e87115918043cae90 -system_ext/priv-app/MotorolaSettingsProvider/MotorolaSettingsProvider.apk|24f463c7f933140eabac397cd305c47bdc6cf496 +# MotCamera4 +product/app/MotCamera3AI/MotCamera3AI.apk;PRESIGNED +product/etc/permissions/com.motorola.camera3.xml +product/etc/permissions/deviceowner-configuration-com.motorola.camera3.xml +product/etc/permissions/privapp-permissions-com.motorola.camera3.xml +product/etc/sysconfig/hiddenapi-whitelist-com.motorola.camera3.xml +product/priv-app/MotCamera4/MotCamera4.apk;PRESIGNED +system/app/MotoSignatureApp/MotoSignatureApp.apk;PRESIGNED +system/etc/permissions/com.motorola.motosignature.xml +system/etc/permissions/moto-core_services.xml +system/etc/permissions/moto-settings.xml +system/framework/com.motorola.motosignature.jar +system/framework/moto-core_services.jar +system/framework/moto-settings.jar +system_ext/bin/motsettings +system_ext/priv-app/MotorolaSettingsProvider/MotorolaSettingsProvider.apk -# Moto Permissions - from motorola/rtwo_g/msi:13/T1TRS33.43-48-41-3/ac9a4-9767e:user/release-keys -product/etc/permissions/com.motorola.camera3.content.ai.xml:vendor/etc/permissions/com.motorola.camera3.content.ai.xml|261f857c62c97286f492b3f5c69ff11226a06af0 -product/etc/permissions/com.motorola.camera3.lens.xml:vendor/etc/permissions/com.motorola.camera3.lens.xml|7dfafac8d89447a1e0bc93fd5cea5ca6e5c20bee -product/etc/permissions/com.motorola.camera3.rtwo.xml:vendor/etc/permissions/com.motorola.camera3.rtwo.xml|f3294bb3f8a743c2885e1e93251a42a5369c4d45 -product/etc/permissions/com.motorola.camera3.xml:vendor/etc/permissions/com.motorola.camera3.xml|0d383cbc8f265d80e4f08c9bb9ecefe321a29a7d -product/etc/permissions/com.motorola.moto-uirefresh.xml|a5c91ea6d99ad0d14e6e13000516c89098621837 -product/etc/permissions/com.motorola.motodisplay.xml|8d2c13a91e2f89f61a82ec2dcfc1958b618a42a5 -product/etc/permissions/privapp-permissions-com.motorola.motodisplay.xml|54a9493312161097ee7b424e0e5ebb0c20fd595e +# Moto Permissions +product/etc/permissions/com.motorola.camera3.content.ai.xml:vendor/etc/permissions/com.motorola.camera3.content.ai.xml +product/etc/permissions/com.motorola.camera3.lens.xml:vendor/etc/permissions/com.motorola.camera3.lens.xml +product/etc/permissions/com.motorola.camera3.rtwo.xml:vendor/etc/permissions/com.motorola.camera3.rtwo.xml +product/etc/permissions/com.motorola.camera3.xml:vendor/etc/permissions/com.motorola.camera3.xml +product/etc/permissions/com.motorola.moto-uirefresh.xml # NFC vendor/bin/hw/vendor.nxp.hardware.nfc@2.0-service