From d42d5ec4c07437e26a52c89e6868fbc83316ebcb Mon Sep 17 00:00:00 2001 From: PixelBoot Date: Fri, 3 Feb 2023 14:13:38 +0100 Subject: [PATCH 01/56] sunfish: Sync PE dependencies --- aosp.dependencies | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 aosp.dependencies diff --git a/aosp.dependencies b/aosp.dependencies new file mode 100644 index 000000000..b42a9cb41 --- /dev/null +++ b/aosp.dependencies @@ -0,0 +1,12 @@ +[ + { + "repository": "kernel_google_msm-4.14", + "target_path": "kernel/google/msm-4.14" + }, + { + "repository":"vendor_google_sunfish", + "target_path":"vendor/google/sunfish", + "branch":"thirteen", + "remote":"pixel-devices-blobs" + } +] From 19423ab7d19784e0f9a1ffe60d166fee8fc14a8c Mon Sep 17 00:00:00 2001 From: PixelBoot Date: Sun, 19 Feb 2023 01:02:27 +0100 Subject: [PATCH 02/56] sunfish: proprietary-files: regenerate --- proprietary-files.txt | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/proprietary-files.txt b/proprietary-files.txt index 56d3c6871..d95b5780f 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -3,8 +3,10 @@ # product partition # Audio +product/etc/ambient/matcher_tah.leveldb product/etc/firmware/music_detector.descriptor product/etc/firmware/music_detector.sound_model +product/priv-app/AmbientSensePrebuilt/AmbientSensePrebuilt.apk;PRESIGNED # Camera extensions product/app/PixelCameraServicesSunfish/PixelCameraServicesSunfish.apk;PRESIGNED @@ -212,21 +214,39 @@ product/etc/CarrierSettings/xfinity_us.pb product/etc/CarrierSettings/yes_my.pb product/etc/CarrierSettings/yoigo_es.pb product/etc/permissions/com.android.sdm.plugins.connmo.xml +product/etc/permissions/com.android.sdm.plugins.dcmo.xml product/etc/permissions/com.android.sdm.plugins.diagmon.xml product/lib/libdmengine.so product/lib/libdmjavaplugin.so +product/priv-app/CarrierServices/CarrierServices.apk;PRESIGNED product/priv-app/CarrierSettings/CarrierSettings.apk;PRESIGNED +product/priv-app/CarrierWifi/CarrierWifi.apk;PRESIGNED +product/priv-app/ConnMO/ConnMO.apk +product/priv-app/DCMO/DCMO.apk +product/priv-app/DMService/DMService.apk product/priv-app/DiagMon/DiagMon.apk product/priv-app/EuiccGoogle/EuiccGoogle.apk;PRESIGNED +product/priv-app/TetheringEntitlement/TetheringEntitlement.apk + +# Sprint +product/etc/permissions/com.android.sdm.plugins.sprintdm.xml +product/priv-app/SprintDM/SprintDM.apk + +# US Cellular +product/etc/permissions/com.android.sdm.plugins.usccdm.xml +product/priv-app/USCCDM/USCCDM.apk # VZW +product/app/VZWAPNLib/VZWAPNLib.apk;PRESIGNED product/etc/permissions/com.android.omadm.service.xml product/etc/permissions/com.google.omadm.trigger.xml product/etc/permissions/com.verizon.apn.xml product/etc/permissions/com.verizon.services.xml product/etc/permissions/features-verizon.xml product/etc/sysconfig/allowlist_com.android.omadm.service.xml +product/priv-app/AppDirectedSMSService/AppDirectedSMSService.apk;PRESIGNED product/priv-app/OemDmTrigger/OemDmTrigger.apk +product/priv-app/WfcActivation/WfcActivation.apk;PRESIGNED # system_ext partition @@ -239,7 +259,7 @@ system_ext/etc/permissions/com.google.android.camera.extensions.xml system_ext/framework/com.google.android.camera.extensions.jar # HBM -system_ext/priv-app/HbmSVManager/HbmSVManager.apk +system_ext/priv-app/HbmSVManager/HbmSVManager.apk|6a55a373faefe30322b77ceafac7a3afd555f617 # Hotword system_ext/etc/permissions/com.android.hotwordenrollment.common.util.xml @@ -605,9 +625,11 @@ system_ext/etc/permissions/com.google.euiccpixel.xml system_ext/etc/permissions/google-ril.xml system_ext/framework/RadioConfigLib.jar system_ext/framework/google-ril.jar +system_ext/priv-app/CarrierSetup/CarrierSetup.apk;PRESIGNED system_ext/priv-app/EuiccGoogleOverlay/EuiccGoogleOverlay.apk system_ext/priv-app/EuiccSupportPixel/EuiccSupportPixel.apk;PRESIGNED system_ext/priv-app/EuiccSupportPixelPermissions/EuiccSupportPixelPermissions.apk;PRESIGNED +system_ext/priv-app/RilConfigService/RilConfigService.apk system_ext/priv-app/grilservice/grilservice.apk;PRESIGNED # SecureUI @@ -618,4 +640,8 @@ system_ext/lib64/libsecureui_svcsock_system.so system_ext/lib64/libsecureuisvc_jni.so # VZW +system_ext/etc/permissions/obdm_permissions.xml system_ext/etc/permissions/vzw_mvs_permissions.xml +system_ext/priv-app/MyVerizonServices/MyVerizonServices.apk;PRESIGNED +system_ext/priv-app/OBDM_Permissions/OBDM_Permissions.apk;PRESIGNED +system_ext/priv-app/obdm_stub/obdm_stub.apk;PRESIGNED From f89461ab0e870cdeafcc7c2ce300456a52f049f6 Mon Sep 17 00:00:00 2001 From: "Josh Fox (XlxFoXxlX)" Date: Wed, 23 Sep 2020 18:11:52 -0400 Subject: [PATCH 03/56] sunfish: Disable mainline checking Mainline checking is relaxed on all other Pixels that inherit mainline makefiles. Currently, this is set to strict and forces builds to fail due to violations in artifact path requirements. Change-Id: I52caa7ecf61fdd7dd9ceffeebf6406914b914f13 --- aosp_sunfish.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aosp_sunfish.mk b/aosp_sunfish.mk index 69c08f1dd..1d8459fb2 100644 --- a/aosp_sunfish.mk +++ b/aosp_sunfish.mk @@ -21,7 +21,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/generic_system.mk) # Enable mainline checking -PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := strict +#PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := strict # # All components inherited here go to system_ext image From f3e31c955b659046cd20c958785949baf85d419f Mon Sep 17 00:00:00 2001 From: PixelBoot Date: Sun, 5 Feb 2023 09:49:33 +0100 Subject: [PATCH 04/56] sunfish: Include googlebattery sepolicy Stops random Device Health Services Adapter crashes. --- sepolicy/sunfish-sepolicy.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/sepolicy/sunfish-sepolicy.mk b/sepolicy/sunfish-sepolicy.mk index ad91ad294..a19777e05 100644 --- a/sepolicy/sunfish-sepolicy.mk +++ b/sepolicy/sunfish-sepolicy.mk @@ -13,4 +13,5 @@ BOARD_SEPOLICY_DIRS += device/google/sunfish/sepolicy/vendor/verizon SYSTEM_EXT_PRIVATE_SEPOLICY_DIRS += device/google/sunfish/sepolicy/system_ext/private # Pixel-wide sepolicy +BOARD_VENDOR_SEPOLICY_DIRS += hardware/google/pixel-sepolicy/googlebattery BOARD_VENDOR_SEPOLICY_DIRS += hardware/google/pixel-sepolicy/powerstats From 440ce94b455645ec0781544c4efaef0b3cb68ef3 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Tue, 7 Feb 2023 19:00:08 +0200 Subject: [PATCH 05/56] Merge tag 'android-13.0.0_r30' into staging/lineage-20_merge-android-13.0.0_r30 Android 13.0.0 Release 30 (TQ1A.230205.002) # -----BEGIN PGP SIGNATURE----- # # iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCY9MaAwAKCRDorT+BmrEO # eLvUAJ9+pIT03tgXky218qFt/49Q2snRlwCfVqG6mgZOrBuyHGmEwXkBXJHRmbk= # =lNiU # -----END PGP SIGNATURE----- # gpg: Signature made Fri Jan 27 02:25:39 2023 EET # gpg: using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78 # gpg: Good signature from "The Android Open Source Project " [marginal] # gpg: initial-contribution@android.com: Verified 1531 signatures in the past # 15 months. Encrypted 4 messages in the past 13 months. # gpg: WARNING: This key is not certified with sufficiently trusted signatures! # gpg: It is not certain that the signature belongs to the owner. # Primary key fingerprint: 4340 D135 70EF 945E 8381 0964 E8AD 3F81 9AB1 0E78 # By Steve Berbary # Via Android Build Coastguard Worker * tag 'android-13.0.0_r30': Update sunfish SVN to 56 Update sunfish SVN to 55 Update sunfish SVN to 54 Update sunfish SVN to 54 Change-Id: I019dadd545056187a753569098e197c373f4d8c9 --- device.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device.mk b/device.mk index 04c6e6fb6..d2e0c635e 100644 --- a/device.mk +++ b/device.mk @@ -1053,7 +1053,7 @@ PRODUCT_PACKAGES += $(HIDL_WRAPPER) # Increment the SVN for any official public releases PRODUCT_PROPERTY_OVERRIDES += \ - ro.vendor.build.svn=53 + ro.vendor.build.svn=55 PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/powerhint.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.json From 49c341d71a24bb52ace51278563bcec198922f17 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Tue, 7 Feb 2023 19:34:35 +0200 Subject: [PATCH 06/56] Update fingerprint/build description from TQ1A.230205.002 Change-Id: I0977c26b63fd6bcba1276f3daf850aad041b4bd4 --- aosp_sunfish.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/aosp_sunfish.mk b/aosp_sunfish.mk index 1d8459fb2..7457e3a84 100644 --- a/aosp_sunfish.mk +++ b/aosp_sunfish.mk @@ -73,8 +73,8 @@ PRODUCT_MODEL := Pixel 4a PRODUCT_BUILD_PROP_OVERRIDES += \ TARGET_PRODUCT=sunfish \ - PRIVATE_BUILD_DESC="sunfish-user 13 TQ1A.230105.001 9292298 release-keys" + PRIVATE_BUILD_DESC="sunfish-user 13 TQ1A.230205.002 9471150 release-keys" -BUILD_FINGERPRINT := google/sunfish/sunfish:13/TQ1A.230105.001/9292298:user/release-keys +BUILD_FINGERPRINT := google/sunfish/sunfish:13/TQ1A.230205.002/9471150:user/release-keys $(call inherit-product, vendor/google/sunfish/sunfish-vendor.mk) From f72ad28fb7f33f4fd9a220c33086d44be2d4acc9 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Tue, 14 Mar 2023 23:30:09 +0200 Subject: [PATCH 07/56] Merge tag 'android-13.0.0_r35' into staging/lineage-20_merge-android-13.0.0_r35 Android 13.0.0 release 35 # -----BEGIN PGP SIGNATURE----- # # iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZA9jpwAKCRDorT+BmrEO # eDvgAJwK/ToIRPgJhP/F5vGvJx37grqomQCgh+NtLgm6z2671t0YQq/g8ypnI84= # =Ic6l # -----END PGP SIGNATURE----- # gpg: Signature made Mon Mar 13 19:55:51 2023 EET # gpg: using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78 # gpg: Good signature from "The Android Open Source Project " [marginal] # gpg: initial-contribution@android.com: Verified 1603 signatures in the past # 16 months. Encrypted 4 messages in the past 14 months. # gpg: WARNING: This key is not certified with sufficiently trusted signatures! # gpg: It is not certain that the signature belongs to the owner. # Primary key fingerprint: 4340 D135 70EF 945E 8381 0964 E8AD 3F81 9AB1 0E78 # By Steve Berbary (7) and others # Via Android Build Coastguard Worker (11) and others * tag 'android-13.0.0_r35': Update sunfish SVN to 57 Update sunfish SVN to 56 Update sunfish SVN to 55 [LPA][Sunfish] Add notification pregrant Update sunfish SVN to 54 Update sunfish SVN to 53 Update sunfish SVN to 52 Update sunfish SVN to 51 Removing deprecated Sunfish target Conflicts: BoardConfig-common.mk device.mk Change-Id: I4d85c5bb2351b9c21a5e991d05fe2784c697ed78 --- BoardConfig-common.mk | 7 ------- default-permissions.xml | 5 +++++ device.mk | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index a8ce67608..5f24bf205 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -243,13 +243,6 @@ BOARD_GOOGLE_DYNAMIC_PARTITIONS_SIZE := 4873781248 # Set error limit to BOARD_SUPER_PARTITON_SIZE - 500MB BOARD_SUPER_PARTITION_ERROR_LIMIT := 9231663104 -# Note as of b/216531063, our sunfish_tuscany builds are -# exceeding the super partition limit, causing all builds -# to fail. Here we increase it by 600 MB to keep building. -ifeq (,$(filter-out sunfish_tuscany, $(TARGET_PRODUCT))) -BOARD_SUPER_PARTITION_ERROR_LIMIT := 9831663104 -endif - # Testing related defines #BOARD_PERFSETUP_SCRIPT := platform_testing/scripts/perf-setup/s5-setup.sh diff --git a/default-permissions.xml b/default-permissions.xml index 1e50e5f12..0c1af4e6d 100644 --- a/default-permissions.xml +++ b/default-permissions.xml @@ -148,4 +148,9 @@ + + + + diff --git a/device.mk b/device.mk index d2e0c635e..1dae717e1 100644 --- a/device.mk +++ b/device.mk @@ -1053,7 +1053,7 @@ PRODUCT_PACKAGES += $(HIDL_WRAPPER) # Increment the SVN for any official public releases PRODUCT_PROPERTY_OVERRIDES += \ - ro.vendor.build.svn=55 + ro.vendor.build.svn=57 PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/powerhint.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.json From bebdb2623e7a0c5a287ec5d06d17a05f752a2c43 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Tue, 14 Mar 2023 04:53:33 +0530 Subject: [PATCH 08/56] proprietary-files: TQ2A.230305.008.C1 Change-Id: I7415edf293218be2b78be87eb31ff23631d2ddc8 --- proprietary-files.txt | 38 ++++++++++++++++++++++++++++++++++---- 1 file changed, 34 insertions(+), 4 deletions(-) diff --git a/proprietary-files.txt b/proprietary-files.txt index d95b5780f..3b3951975 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -50,14 +50,19 @@ product/framework/uimremoteserverlibrary.jar product/framework/uimservicelibrary.jar # Radio +product/etc/CarrierSettings/1and1_de.pb product/etc/CarrierSettings/a1_at.pb product/etc/CarrierSettings/ahamo_jp.pb product/etc/CarrierSettings/airtel_in.pb +product/etc/CarrierSettings/ais_th.pb product/etc/CarrierSettings/apt_tw.pb product/etc/CarrierSettings/assurance_us.pb +product/etc/CarrierSettings/astca_as.pb product/etc/CarrierSettings/att5g_us.pb product/etc/CarrierSettings/att5gsa_us.pb +product/etc/CarrierSettings/attmvnos_us.pb product/etc/CarrierSettings/att_us.pb +product/etc/CarrierSettings/base_be.pb product/etc/CarrierSettings/bell_ca.pb product/etc/CarrierSettings/bluegrass_us.pb product/etc/CarrierSettings/boost_us.pb @@ -65,6 +70,7 @@ product/etc/CarrierSettings/boosttmo_us.pb product/etc/CarrierSettings/bouygues_fr.pb product/etc/CarrierSettings/btb_gb.pb product/etc/CarrierSettings/btc_gb.pb +product/etc/CarrierSettings/carolinawest_us.pb product/etc/CarrierSettings/carrier_list.pb product/etc/CarrierSettings/celcom_my.pb product/etc/CarrierSettings/cellcom_us.pb @@ -99,6 +105,8 @@ product/etc/CarrierSettings/fizz_ca.pb product/etc/CarrierSettings/free_fr.pb product/etc/CarrierSettings/freedommobile_ca.pb product/etc/CarrierSettings/gamma_gb.pb +product/etc/CarrierSettings/gci_us.pb +product/etc/CarrierSettings/gibtel_gi.pb product/etc/CarrierSettings/giga_sg.pb product/etc/CarrierSettings/h3_at.pb product/etc/CarrierSettings/h3_gb.pb @@ -121,22 +129,31 @@ product/etc/CarrierSettings/linemo_jp.pb product/etc/CarrierSettings/luckymobile_ca.pb product/etc/CarrierSettings/m1_sg.pb product/etc/CarrierSettings/maxis_my.pb +product/etc/CarrierSettings/meo_pt.pb product/etc/CarrierSettings/metropcs_us.pb product/etc/CarrierSettings/movistar_es.pb +product/etc/CarrierSettings/nextech_us.pb +product/etc/CarrierSettings/nos_pt.pb product/etc/CarrierSettings/o2_de.pb product/etc/CarrierSettings/o2postpaid_gb.pb product/etc/CarrierSettings/o2prepaid_de.pb product/etc/CarrierSettings/o2prepaid_gb.pb product/etc/CarrierSettings/onecall_no.pb product/etc/CarrierSettings/optus_au.pb +product/etc/CarrierSettings/orange_be.pb product/etc/CarrierSettings/orange_es.pb product/etc/CarrierSettings/orange_fr.pb +product/etc/CarrierSettings/orange_re.pb product/etc/CarrierSettings/others.pb +product/etc/CarrierSettings/partner_il.pb product/etc/CarrierSettings/pcmobilebell_ca.pb +product/etc/CarrierSettings/pelephone_il.pb product/etc/CarrierSettings/play_pl.pb +product/etc/CarrierSettings/post_lu.pb product/etc/CarrierSettings/povo_jp.pb product/etc/CarrierSettings/publicmobile_ca.pb product/etc/CarrierSettings/rakuten_jp.pb +product/etc/CarrierSettings/redpocketatt_us.pb product/etc/CarrierSettings/redpockettmo_us.pb product/etc/CarrierSettings/rjio_in.pb product/etc/CarrierSettings/rogers5g_ca.pb @@ -146,6 +163,7 @@ product/etc/CarrierSettings/shaw_ca.pb product/etc/CarrierSettings/simba_sg.pb product/etc/CarrierSettings/simple_us.pb product/etc/CarrierSettings/singtel_sg.pb +product/etc/CarrierSettings/skinny_nz.pb product/etc/CarrierSettings/smarty_gb.pb product/etc/CarrierSettings/softbank_jp.pb product/etc/CarrierSettings/solomobile_ca.pb @@ -156,21 +174,30 @@ product/etc/CarrierSettings/sprintprepaid_us.pb product/etc/CarrierSettings/sprintwholesale_us.pb product/etc/CarrierSettings/starhub_sg.pb product/etc/CarrierSettings/stc_sa.pb +product/etc/CarrierSettings/strata_us.pb product/etc/CarrierSettings/sunrise_ch.pb product/etc/CarrierSettings/swisscom_ch.pb product/etc/CarrierSettings/swisscom_li.pb product/etc/CarrierSettings/talkmobile_gb.pb +product/etc/CarrierSettings/tango_us.pb product/etc/CarrierSettings/tbaytel_ca.pb +product/etc/CarrierSettings/tchibo_de.pb product/etc/CarrierSettings/tdc_dk.pb product/etc/CarrierSettings/tele2_se.pb product/etc/CarrierSettings/telekom_de.pb +product/etc/CarrierSettings/telekom_gr.pb +product/etc/CarrierSettings/telekom_hr.pb product/etc/CarrierSettings/telekom_hu.pb product/etc/CarrierSettings/telekom_pl.pb product/etc/CarrierSettings/telekom_sk.pb +product/etc/CarrierSettings/telenet_be.pb product/etc/CarrierSettings/telenor_dk.pb product/etc/CarrierSettings/telenor_no.pb product/etc/CarrierSettings/telenor_se.pb product/etc/CarrierSettings/telia_dk.pb +product/etc/CarrierSettings/telia_ee.pb +product/etc/CarrierSettings/telia_fi.pb +product/etc/CarrierSettings/telia_lt.pb product/etc/CarrierSettings/telia_no.pb product/etc/CarrierSettings/telia_se.pb product/etc/CarrierSettings/telstra_au.pb @@ -193,7 +220,9 @@ product/etc/CarrierSettings/uqmobile_jp.pb product/etc/CarrierSettings/uscc_us.pb product/etc/CarrierSettings/verizon_us.pb product/etc/CarrierSettings/verymobile_it.pb +product/etc/CarrierSettings/viaero_us.pb product/etc/CarrierSettings/videotron_ca.pb +product/etc/CarrierSettings/vimla_se.pb product/etc/CarrierSettings/virgin_ca.pb product/etc/CarrierSettings/virgin_gb.pb product/etc/CarrierSettings/virgin_us.pb @@ -204,15 +233,20 @@ product/etc/CarrierSettings/vodafone_cz.pb product/etc/CarrierSettings/vodafone_de.pb product/etc/CarrierSettings/vodafone_es.pb product/etc/CarrierSettings/vodafone_gb.pb +product/etc/CarrierSettings/vodafone_hu.pb product/etc/CarrierSettings/vodafone_ie.pb product/etc/CarrierSettings/vodafone_in.pb product/etc/CarrierSettings/vodafone_it.pb product/etc/CarrierSettings/vodafone_nl.pb +product/etc/CarrierSettings/vodafone_nz.pb +product/etc/CarrierSettings/vodafone_pt.pb product/etc/CarrierSettings/vodafone_tr.pb product/etc/CarrierSettings/windtre_it.pb product/etc/CarrierSettings/xfinity_us.pb product/etc/CarrierSettings/yes_my.pb +product/etc/CarrierSettings/yettel_hu.pb product/etc/CarrierSettings/yoigo_es.pb +product/etc/CarrierSettings/zain_kw.pb product/etc/permissions/com.android.sdm.plugins.connmo.xml product/etc/permissions/com.android.sdm.plugins.dcmo.xml product/etc/permissions/com.android.sdm.plugins.diagmon.xml @@ -250,10 +284,6 @@ product/priv-app/WfcActivation/WfcActivation.apk;PRESIGNED # system_ext partition -# AptX -system_ext/lib64/libaptXHD_encoder.so -system_ext/lib64/libaptX_encoder.so - # Camera extensions system_ext/etc/permissions/com.google.android.camera.extensions.xml system_ext/framework/com.google.android.camera.extensions.jar From f240cf5df9c8f5ae9ada7fc60939556858f772fc Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Fri, 17 Mar 2023 17:22:56 +0200 Subject: [PATCH 09/56] Update fingerprint/build description from TQ2A.230305.008.C1 Change-Id: I28e59786e2562de5bca773b2ba00e88d17ba5a39 --- aosp_sunfish.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/aosp_sunfish.mk b/aosp_sunfish.mk index 7457e3a84..92e07bb70 100644 --- a/aosp_sunfish.mk +++ b/aosp_sunfish.mk @@ -73,8 +73,8 @@ PRODUCT_MODEL := Pixel 4a PRODUCT_BUILD_PROP_OVERRIDES += \ TARGET_PRODUCT=sunfish \ - PRIVATE_BUILD_DESC="sunfish-user 13 TQ1A.230205.002 9471150 release-keys" + PRIVATE_BUILD_DESC="sunfish-user 13 TQ2A.230305.008.C1 9619669 release-keys" -BUILD_FINGERPRINT := google/sunfish/sunfish:13/TQ1A.230205.002/9471150:user/release-keys +BUILD_FINGERPRINT := google/sunfish/sunfish:13/TQ2A.230305.008.C1/9619669:user/release-keys $(call inherit-product, vendor/google/sunfish/sunfish-vendor.mk) From 2303dd1dfd188f83a8338f0086b753d3f7d4a7dd Mon Sep 17 00:00:00 2001 From: ReallySnow Date: Wed, 29 Mar 2023 00:07:26 +0200 Subject: [PATCH 10/56] sunfish: Initial minimal privapp permissions * Used to deal with permission issues caused by Gapps updates Change-Id: I39661b1250f2f2bfb3d7ce722affe429bcd2de2a --- device.mk | 5 +++++ permissions/pixel_permissions_product.xml | 11 +++++++++++ 2 files changed, 16 insertions(+) create mode 100644 permissions/pixel_permissions_product.xml diff --git a/device.mk b/device.mk index 1dae717e1..169ce12d0 100644 --- a/device.mk +++ b/device.mk @@ -1027,6 +1027,11 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/fstab.postinstall:$(TARGET_COPY_OUT_PRODUCT)/etc/fstab.postinstall +# Permissions +# NOTE: Used to deal with permission issues caused by Gapps updates +PRODUCT_COPY_FILES += \ + device/google/sunfish/permissions/pixel_permissions_product.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/pixel_permissions_product.xml + # powerstats HAL PRODUCT_PACKAGES += \ android.hardware.power.stats@1.0-service.pixel diff --git a/permissions/pixel_permissions_product.xml b/permissions/pixel_permissions_product.xml new file mode 100644 index 000000000..775105074 --- /dev/null +++ b/permissions/pixel_permissions_product.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + From b4358adbcfbbcbd276a42563b0c38691f542cca9 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Tue, 11 Apr 2023 04:24:41 +0300 Subject: [PATCH 11/56] Merge tag 'android-13.0.0_r38' into staging/lineage-20_merge-android-13.0.0_r38 Android 13.0.0 Release 38 (TQ2A.230405.003) # -----BEGIN PGP SIGNATURE----- # # iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZDRdSAAKCRDorT+BmrEO # eN6NAKCOWf+FAEML307P76iZLYW2Y88XbQCfb5O8MRq0FV9asgbc8JUqskWtm6k= # =ND+Y # -----END PGP SIGNATURE----- # gpg: Signature made Mon Apr 10 22:02:32 2023 EEST # gpg: using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78 # gpg: Good signature from "The Android Open Source Project " [marginal] # gpg: initial-contribution@android.com: Verified 1650 signatures in the past # 17 months. Encrypted 4 messages in the past 15 months. # gpg: WARNING: This key is not certified with sufficiently trusted signatures! # gpg: It is not certain that the signature belongs to the owner. # Primary key fingerprint: 4340 D135 70EF 945E 8381 0964 E8AD 3F81 9AB1 0E78 # By Steve Berbary # Via Android Build Coastguard Worker * tag 'android-13.0.0_r38': Update sunfish SVN to 58 Change-Id: I7f85f28fd1c0ecc54aa5a9483b365c4bed5081d5 --- device.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device.mk b/device.mk index 169ce12d0..bfc00359e 100644 --- a/device.mk +++ b/device.mk @@ -1058,7 +1058,7 @@ PRODUCT_PACKAGES += $(HIDL_WRAPPER) # Increment the SVN for any official public releases PRODUCT_PROPERTY_OVERRIDES += \ - ro.vendor.build.svn=57 + ro.vendor.build.svn=58 PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/powerhint.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.json From 764fb44a89ed8274a4d5dccebd1ba8441e2cbdf9 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Tue, 11 Apr 2023 15:16:04 +0300 Subject: [PATCH 12/56] Update fingerprint/build description from TQ2A.230405.003 Change-Id: I336541ad7bc0c1c8564d34bf678dbb48e1d3ae6a --- aosp_sunfish.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/aosp_sunfish.mk b/aosp_sunfish.mk index 92e07bb70..730c28803 100644 --- a/aosp_sunfish.mk +++ b/aosp_sunfish.mk @@ -73,8 +73,8 @@ PRODUCT_MODEL := Pixel 4a PRODUCT_BUILD_PROP_OVERRIDES += \ TARGET_PRODUCT=sunfish \ - PRIVATE_BUILD_DESC="sunfish-user 13 TQ2A.230305.008.C1 9619669 release-keys" + PRIVATE_BUILD_DESC="sunfish-user 13 TQ2A.230405.003 9719927 release-keys" -BUILD_FINGERPRINT := google/sunfish/sunfish:13/TQ2A.230305.008.C1/9619669:user/release-keys +BUILD_FINGERPRINT := google/sunfish/sunfish:13/TQ2A.230405.003/9719927:user/release-keys $(call inherit-product, vendor/google/sunfish/sunfish-vendor.mk) From a3106ebd4d8c897cb89e98d4b21e84dfeb298e23 Mon Sep 17 00:00:00 2001 From: PixelBoot Date: Wed, 19 Apr 2023 16:58:58 +0200 Subject: [PATCH 13/56] Revert "Preopt SystemUI for AOSP builds." This reverts commit 18ba3e75680f005269f97d89d13598897498067c. --- device.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/device.mk b/device.mk index bfc00359e..01fe1f54f 100644 --- a/device.mk +++ b/device.mk @@ -947,8 +947,8 @@ PRODUCT_PROPERTY_OVERRIDES += \ persist.vendor.sys.modem.diag.mdlog_br_num=5 # Preopt SystemUI -PRODUCT_DEXPREOPT_SPEED_APPS += SystemUIGoogle # For internal -PRODUCT_DEXPREOPT_SPEED_APPS += SystemUI # For AOSP +PRODUCT_DEXPREOPT_SPEED_APPS += \ + SystemUIGoogle # Compile SystemUI on device with `speed`. PRODUCT_PROPERTY_OVERRIDES += \ From c156127131a358294fb201b73477b5e4a7f2d8b7 Mon Sep 17 00:00:00 2001 From: PixelBoot Date: Wed, 19 Apr 2023 16:59:33 +0200 Subject: [PATCH 14/56] Revert "sunfish: Pin standard SystemUI instead of Google's" This reverts commit 53b6cb191070022ee492e597ec32c2269840125c. --- overlay/frameworks/base/core/res/res/values/config.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml index d4062a265..670b6c6c9 100755 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ b/overlay/frameworks/base/core/res/res/values/config.xml @@ -288,7 +288,7 @@ "/apex/com.android.art/javalib/core-oj.jar" "/apex/com.android.art/javalib/core-libart.jar" "/system/bin/surfaceflinger" - "/system_ext/priv-app/SystemUI/SystemUI.apk" + "/system_ext/priv-app/SystemUIGoogle/SystemUIGoogle.apk" From 0fdddfac94d5946aa02e33041b686ac9c0c7cc38 Mon Sep 17 00:00:00 2001 From: jhenrique09 Date: Wed, 4 Jan 2023 15:02:35 -0300 Subject: [PATCH 15/56] redbull: Include nfc manifest Required after https://github.com/PixelExperience-Staging/hardware_st_nfc/commit/31922de466ec37c89946a9451093a640499c95f9 --- BoardConfig-common.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index 5f24bf205..de50ebf8f 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -220,6 +220,7 @@ TARGET_GRALLOC_HANDLE_HAS_RESERVED_SIZE := true # Vendor Interface Manifest DEVICE_MANIFEST_FILE := device/google/sunfish/manifest.xml DEVICE_MATRIX_FILE := device/google/sunfish/compatibility_matrix.xml +DEVICE_MANIFEST_FILE += hardware/st/nfc/aidl/nfc-service-default.xml # Install product specific framework compatibility matrix # (TODO: b/169535506) This includes the FCM for system_ext and product partition. # It must be split into the FCM of each partition. From 84c68a3ac87a9736cdc2722159ad5d58128a81b3 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Tue, 2 May 2023 01:17:13 +0300 Subject: [PATCH 16/56] Merge tag 'android-13.0.0_r43' into staging/lineage-20_merge-android-13.0.0_r43 Android 13.0.0 release 43 # -----BEGIN PGP SIGNATURE----- # # iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZFABdgAKCRDorT+BmrEO # ePyJAJ9upHhKpozyc5agXlpAiQ8Fgi6m4wCfU2d4PENwupo1Yd7pXWnrU1C8Go8= # =xLpe # -----END PGP SIGNATURE----- # gpg: Signature made Mon May 1 21:14:14 2023 EEST # gpg: using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78 # gpg: Good signature from "The Android Open Source Project " [marginal] # gpg: initial-contribution@android.com: Verified 1668 signatures in the past # 18 months. Encrypted 4 messages in the past 15 months. # gpg: WARNING: This key is not certified with sufficiently trusted signatures! # gpg: It is not certain that the signature belongs to the owner. # Primary key fingerprint: 4340 D135 70EF 945E 8381 0964 E8AD 3F81 9AB1 0E78 # By Steve Berbary # Via Android Build Coastguard Worker * tag 'android-13.0.0_r43': Update sunfish SVN to 60 Update sunfish SVN to 59 Update sunfish SVN to 59 Change-Id: I45a5125740ad20b2761b859358edaf1cb50b7146 --- device.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device.mk b/device.mk index 01fe1f54f..14c80d1ee 100644 --- a/device.mk +++ b/device.mk @@ -1058,7 +1058,7 @@ PRODUCT_PACKAGES += $(HIDL_WRAPPER) # Increment the SVN for any official public releases PRODUCT_PROPERTY_OVERRIDES += \ - ro.vendor.build.svn=58 + ro.vendor.build.svn=60 PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/powerhint.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.json From 1c1be8448ab016eb15d4b7e8616db452080a5fc1 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Tue, 2 May 2023 01:19:42 +0300 Subject: [PATCH 17/56] Update fingerprint/build description from TQ2A.230505.002 Change-Id: I22bb96f12fe56df4caf1cb575632fe91dfa91ce1 --- aosp_sunfish.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/aosp_sunfish.mk b/aosp_sunfish.mk index 730c28803..5a0f1e2df 100644 --- a/aosp_sunfish.mk +++ b/aosp_sunfish.mk @@ -73,8 +73,8 @@ PRODUCT_MODEL := Pixel 4a PRODUCT_BUILD_PROP_OVERRIDES += \ TARGET_PRODUCT=sunfish \ - PRIVATE_BUILD_DESC="sunfish-user 13 TQ2A.230405.003 9719927 release-keys" + PRIVATE_BUILD_DESC="sunfish-user 13 TQ2A.230505.002 9891397 release-keys" -BUILD_FINGERPRINT := google/sunfish/sunfish:13/TQ2A.230405.003/9719927:user/release-keys +BUILD_FINGERPRINT := google/sunfish/sunfish:13/TQ2A.230505.002/9891397:user/release-keys $(call inherit-product, vendor/google/sunfish/sunfish-vendor.mk) From 65600cfef0ee95f276297e36caa063c68eb8c697 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Tue, 16 May 2023 15:24:32 +0300 Subject: [PATCH 18/56] sunfish: Update gps.conf Apply the following commits from the GPS HAL gps.conf: 9cc808c GPS NMEA: enhance gga fix qualtiy for sensor contributed fix 7bd18fd FR56985: NMEA reporting rate configuration in N-Hz2.0 mode d71529a Logging buffer implemented by skip list d9182f7 update default gps.conf entries fdbbb0d Remove XTRA version check. 61260d6 update gps.conf configurations for eDGNSS 8dc2ec8 Enable new LPP Profile options for 5G b72ebe3 Add option for pds api deployment config c42382c Remove CDFW_USERS from gps.conf 3edeba1 Support baseband C/N0 in SV info for older modems 17923fd add nmea tag block grouping feature No functional changes. Change-Id: Idd15f56ad7280887dcb5645330c7b430c9066d63 --- gps.conf | 136 ++++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 114 insertions(+), 22 deletions(-) diff --git a/gps.conf b/gps.conf index cefae221f..b3f4102f3 100644 --- a/gps.conf +++ b/gps.conf @@ -1,10 +1,3 @@ -#Version check for XTRA -#DISABLE = 0 -#AUTO = 1 -#XTRA2 = 2 -#XTRA3 = 3 -XTRA_VERSION_CHECK=0 - # Error Estimate # _SET = 1 # _CLEAR = 0 @@ -81,10 +74,12 @@ CAPABILITIES=0x17 #################################### # LTE Positioning Profile Settings #################################### +# LPP_PROFILE is a bit mask # 0: Enable RRLP on LTE(Default) -# 1: Enable LPP_User_Plane on LTE -# 2: Enable LPP_Control_Plane -# 3: Enable both LPP_User_Plane and LPP_Control_Plane +# 0x1: LPP User Plane +# 0x2: LPP Control Plane +# 0x4: LPP User Plane for NR5G +# 0x8: LPP Control Plane for NR5G #LPP_PROFILE = 2 #################################### @@ -99,6 +94,49 @@ DATUM_TYPE = 0 ################################ # NMEA provider (1=Modem Processor, 0=Application Processor) NMEA_PROVIDER=0 + +################################ +# NMEA TAG BLOCK GROUPING +################################ +# NMEA tag block grouping is only applicable to GSA +# Default is disabled +# 0 - disabled +# 1 - enabled +NMEA_TAG_BLOCK_GROUPING_ENABLED = 0 + +# Customized NMEA GGA fix quality that can be used to tell +# whether SENSOR contributed to the fix. +# +# When this configuration item is not enabled (set to any value that is not 1), +# GGA fix quality conforms to NMEA standard spec as below: +# PPP/DGNSS/SBAS correction fix w/ or w/o sensor: 2 +# RTK fixed fix w/ or w/o sensor: 4 +# RTK float fix w/ or w/o sensor: 5 +# SPE fix w/ or w/o sensor: 1 +# Sensor dead reckoning fix: 6 +# +# When this configuration is enabled (set to 1), GGA fix quality +# will be output as below: +# PPP fix w/o sensor: 59, w/ sensor: 69 +# DGNSS/SBAS correction fix w/o sensor: 2, w/ sensor: 62 +# RTK fixed fix w/o sensor: 4, w/ sensor: 64 +# RTK float fix w/o sensor: 5, w/ sensor: 65, +# SPE fix w/o sensor: 1, and w/ sensor: 61 +# Sensor dead reckoning fix: 6 +# +# any value that is not 1 - disabled +# 1 - enabled +CUSTOM_NMEA_GGA_FIX_QUALITY_ENABLED = 0 + +################################ +# NMEA Reporting Rate Config, valid only when NMEA_PROVIDER is set to "0" +################################ +# NMEA Reporting Rate +# Set it to "1HZ" for 1Hz NMEA Reporting +# Set it to "NHZ" for NHz NMEA Reporting +#Default : NHZ (overridden by position update rate if set to lower rates) +NMEA_REPORT_RATE=NHZ + # Mark if it is a SGLTE target (1=SGLTE, 0=nonSGLTE) SGLTE_TARGET=0 @@ -159,16 +197,6 @@ AGPS_CONFIG_INJECT = 1 # is able to acquire better timing information AP_TIMESTAMP_UNCERTAINTY = 10 -################################################## -# QDR engine availability status -################################################## -# 0 : NO QDR (default) -# 1 : QDR enabled -# This settings enables QDR Configuration for -# automotive use case, if enabled then -# DR_AP_Service needs to be enabled in izat.conf -#EXTERNAL_DR_ENABLED = 0 - ##################################### # DR_SYNC Pulse Availability ##################################### @@ -293,7 +321,71 @@ CP_MTLR_ES=1 ################################################## # 0 : Enable QTI GNSS (default) # 1 : Enable QCSR SS5 -# This setting use to select between QTI GNSS -# and QCSR SS5 hardware receiver. +# 2 : Enable PDS API +# This setting use to select between QTI GNSS, +# QCSR SS5 hardware receiver, and PDS API. # By default QTI GNSS receiver is enabled. # GNSS_DEPLOYMENT = 0 + +################################################## +## LOG BUFFER CONFIGURATION +################################################## +#LOG_BUFFER_ENABLED, 1=enable, 0=disable +#*_LEVEL_TIME_DEPTH, maximum time depth of level * +#in log buffer, unit is second +#*_LEVEL_MAX_CAPACITY, maximum numbers of level * +#log print sentences in log buffer +LOG_BUFFER_ENABLED = 0 +E_LEVEL_TIME_DEPTH = 600 +E_LEVEL_MAX_CAPACITY = 50 +W_LEVEL_TIME_DEPTH = 500 +W_LEVEL_MAX_CAPACITY = 100 +I_LEVEL_TIME_DEPTH = 400 +I_LEVEL_MAX_CAPACITY = 200 +D_LEVEL_TIME_DEPTH = 30 +D_LEVEL_MAX_CAPACITY = 300 +V_LEVEL_TIME_DEPTH = 200 +V_LEVEL_MAX_CAPACITY = 400 + +################################################## +# Allow buffer diag log packets when diag memory allocation +# fails during boot up time. +################################################## +BUFFER_DIAG_LOGGING = 1 + +####################################### +# NTRIP CLIENT LIBRARY NAME +####################################### +# NTRIP_CLIENT_LIB_NAME = + +################################################## +# Correction Data Framework settings +# Default values: +# CDFW_SOURCE_PRIORITY_1 = INTERNAL_1 RTCM +# CDFW_INJECT_DATA_INTERVAL = 600000 //10 mins +# CDFW_RTCM_MESSAGE_INTERVAL = 1000 //1 second +# +# If multiple sources coexist on a PL, +# the prorioty sequence can be set by the integer number. +# PRIORITY_1 is higher than PRIORITY_2, for example, +# CDFW_SOURCE_PRIORITY_1 = INTERNAL_1 RTCM +# CDFW_SOURCE_PRIORITY_2 = CV2X RTCM +################################################## + +################################################## +# RF LOSS +# The loss in 0.1 dbHz from the C/N0 at the antenna port +# These values must be configured by OEM if not +# supported in QMI LOC message +# There is one entry for each signal type +################################################## +RF_LOSS_GPS = 0 +RF_LOSS_GPS_L5 = 0 +RF_LOSS_GLO_LEFT = 0 +RF_LOSS_GLO_CENTER = 0 +RF_LOSS_GLO_RIGHT = 0 +RF_LOSS_BDS = 0 +RF_LOSS_BDS_B2A = 0 +RF_LOSS_GAL = 0 +RF_LOSS_GAL_E5 = 0 +RF_LOSS_NAVIC = 0 From 629c436f7bafe7d9d2cfcb2173616e9b0f374f78 Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Sat, 13 May 2023 22:31:22 +0000 Subject: [PATCH 19/56] Update sunfish SVN to 62 Bug: 282371465 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:410aa5f88791eacd179dc2f637d7def8fd4e3eb5) Merged-In: I754dee9fb3d5692687868d2ef992e37dedefe8d6 Change-Id: I754dee9fb3d5692687868d2ef992e37dedefe8d6 --- device.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device.mk b/device.mk index 14c80d1ee..d9a432b8d 100644 --- a/device.mk +++ b/device.mk @@ -1058,7 +1058,7 @@ PRODUCT_PACKAGES += $(HIDL_WRAPPER) # Increment the SVN for any official public releases PRODUCT_PROPERTY_OVERRIDES += \ - ro.vendor.build.svn=60 + ro.vendor.build.svn=62 PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/powerhint.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.json From c155e93feb4e7ffaad779acaa71a84472c094642 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Thu, 11 May 2023 18:29:02 +0300 Subject: [PATCH 20/56] init: Don't read serial_number Pixels use ro.product.model for product, this has no effect Change-Id: I6caea23a88986633ed25df5ae45fde857bb0fb60 --- init.qcom.usb.sh | 7 ------- 1 file changed, 7 deletions(-) diff --git a/init.qcom.usb.sh b/init.qcom.usb.sh index cc7dab42c..d3e9559c5 100644 --- a/init.qcom.usb.sh +++ b/init.qcom.usb.sh @@ -154,13 +154,6 @@ esac # check configfs is mounted or not if [ -d /config/usb_gadget ]; then - # Chip-serial is used for unique MSM identification in Product string - msm_serial=`cat /sys/devices/soc0/serial_number`; - msm_serial_hex=`printf %08X $msm_serial` - machine_type=`cat /sys/devices/soc0/machine` - product_string="$machine_type-$soc_hwplatform _SN:$msm_serial_hex" - echo "$product_string" > /config/usb_gadget/g1/strings/0x409/product - # ADB requires valid iSerialNumber; if ro.serialno is missing, use dummy serialnumber=`cat /config/usb_gadget/g1/strings/0x409/serialnumber` 2> /dev/null if [ "$serialnumber" == "" ]; then From 83ab492f23b6374e508474f40933459f2f833ba0 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Thu, 11 May 2023 18:31:30 +0300 Subject: [PATCH 21/56] dumpstate: Don't dump serial number Change-Id: I575db41209d3a5f8088f7388089650a265107b65 --- dumpstate/DumpstateDevice.cpp | 1 - sepolicy/vendor/google/hal_dumpstate_impl.te | 3 --- 2 files changed, 4 deletions(-) diff --git a/dumpstate/DumpstateDevice.cpp b/dumpstate/DumpstateDevice.cpp index 18636a2ea..eb37c8968 100755 --- a/dumpstate/DumpstateDevice.cpp +++ b/dumpstate/DumpstateDevice.cpp @@ -654,7 +654,6 @@ Return DumpstateDevice::dumpstateBoard_1_1(const hidl_handle& h } RunCommandToFd(fd, "VENDOR PROPERTIES", {"/vendor/bin/getprop"}); - DumpFileToFd(fd, "SoC serial number", "/sys/devices/soc0/serial_number"); DumpFileToFd(fd, "CPU present", "/sys/devices/system/cpu/present"); DumpFileToFd(fd, "CPU online", "/sys/devices/system/cpu/online"); DumpFileToFd(fd, "Bootloader Log", "/proc/bldrlog"); diff --git a/sepolicy/vendor/google/hal_dumpstate_impl.te b/sepolicy/vendor/google/hal_dumpstate_impl.te index 11198c827..4fbaa726a 100644 --- a/sepolicy/vendor/google/hal_dumpstate_impl.te +++ b/sepolicy/vendor/google/hal_dumpstate_impl.te @@ -120,9 +120,6 @@ userdebug_or_eng(` allow hal_dumpstate_impl sensors_vendor_data_file:file r_file_perms; ') -# Access to /sys/devices/soc0/serial_number -r_dir_file(hal_dumpstate_impl, sysfs_soc) - # Access to modem stat domain_auto_trans(hal_dumpstate_impl, modem_svc_exec, modem_svc) allow hal_dumpstate_impl modem_stat_data_file:file r_file_perms; From 75724ad4c9fb0acbe7bf519afb60a1795ad88bc4 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Thu, 11 May 2023 19:31:06 +0300 Subject: [PATCH 22/56] ueventd: Remove all permissions from /sys/devices/soc0/serial_number Change-Id: I688347cfe59f56e4de2e4bf3c3324ca465f7a897 --- ueventd.rc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ueventd.rc b/ueventd.rc index a02687c8c..58fb69fd9 100644 --- a/ueventd.rc +++ b/ueventd.rc @@ -143,3 +143,6 @@ firmware_directories /vendor/firmware_mnt/image/ #KGSL /sys/class/kgsl/kgsl-3d0 perfcounter 0660 root shell + +# socinfo +/sys/devices/soc0 serial_number 0000 root root From 26bf06022a07986551fb7c286a47ad8a7ad7775d Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Thu, 11 May 2023 19:02:30 +0300 Subject: [PATCH 23/56] sepolicy: Restrict access to /sys/devices/soc0/serial_number Change-Id: I6254ef6e160ff0d3c3ce2e51f20f557e75826dff --- sepolicy/vendor/google/genfs_contexts | 1 + sepolicy/vendor/qcom/common/file.te | 1 + 2 files changed, 2 insertions(+) diff --git a/sepolicy/vendor/google/genfs_contexts b/sepolicy/vendor/google/genfs_contexts index de173a2f7..976a2a64a 100644 --- a/sepolicy/vendor/google/genfs_contexts +++ b/sepolicy/vendor/google/genfs_contexts @@ -2,6 +2,7 @@ genfscon debugfs /f2fs u:object_r:debugfs_f2fs:s0 genfscon debugfs /ufshcd0 u:object_r:debugfs_ufs:s0 genfscon proc /sys/kernel/sched_boost u:object_r:proc_sysctl_schedboost:s0 genfscon sysfs /devices/soc0 u:object_r:sysfs_soc:s0 +genfscon sysfs /devices/soc0/serial_number u:object_r:sysfs_soc_sensitive:s0 genfscon sysfs /devices/platform/soc/1d84000.ufshc/slowio_read_cnt u:object_r:sysfs_scsi_devices_0000:s0 genfscon sysfs /devices/platform/soc/1d84000.ufshc/slowio_write_cnt u:object_r:sysfs_scsi_devices_0000:s0 genfscon sysfs /devices/platform/soc/1d84000.ufshc/slowio_unmap_cnt u:object_r:sysfs_scsi_devices_0000:s0 diff --git a/sepolicy/vendor/qcom/common/file.te b/sepolicy/vendor/qcom/common/file.te index 8a72ceab7..2143a726a 100644 --- a/sepolicy/vendor/qcom/common/file.te +++ b/sepolicy/vendor/qcom/common/file.te @@ -10,6 +10,7 @@ type chre_socket, file_type; type sysfs_hsic_modem_wait, sysfs_type, fs_type; type sysfs_smd_open_timeout, sysfs_type, fs_type; type sysfs_soc, sysfs_type, fs_type; +type sysfs_soc_sensitive, sysfs_type, fs_type; type sysfs_msm_subsys, sysfs_type, fs_type; type sysfs_spss, sysfs_type, fs_type; type netmgrd_data_file, file_type, data_file_type; From 1f8a5bfdeeee2bd03c39fe61d309fed0da72fa5d Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Wed, 14 Jun 2023 21:25:17 +0300 Subject: [PATCH 24/56] Merge tag 'android-13.0.0_r51' into staging/lineage-20_merge-android-13.0.0_r51 Android 13.0.0 Release 51 (TQ3A.230605.011) * tag 'android-13.0.0_r51': Update sunfish SVN to 61 update AIDL IGoogleBattery manifest version to 2 Update sunfish SVN to 60 Update sunfish SVN to 59 Update sunfish SVN to 58 Set the default loop driver queue depth to 31 Update sunfish SVN to 57 Conflicts: device.mk Change-Id: I1345f0887efeb48bfb024800b1ac24afbbde56c9 --- BoardConfig-common.mk | 1 + device_framework_matrix_product.xml | 2 +- manifest.xml | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index de50ebf8f..3e08142e3 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -59,6 +59,7 @@ BOARD_KERNEL_CMDLINE += androidboot.memcg=1 cgroup.memory=nokmem BOARD_KERNEL_CMDLINE += lpm_levels.sleep_disabled=1 #STOPSHIP BOARD_KERNEL_CMDLINE += usbcore.autosuspend=7 BOARD_KERNEL_CMDLINE += loop.max_part=7 +BOARD_KERNEL_CMDLINE += loop.hw_queue_depth=31 BOARD_KERNEL_CMDLINE += androidboot.usbcontroller=a600000.dwc3 swiotlb=1 BOARD_KERNEL_CMDLINE += androidboot.boot_devices=soc/1d84000.ufshc BOARD_KERNEL_CMDLINE += cgroup_disable=pressure diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml index 8220a5247..8daa0a456 100644 --- a/device_framework_matrix_product.xml +++ b/device_framework_matrix_product.xml @@ -73,7 +73,7 @@ vendor.google.google_battery - 1 + 2 IGoogleBattery default diff --git a/manifest.xml b/manifest.xml index 2e1e9ba5b..688079b28 100644 --- a/manifest.xml +++ b/manifest.xml @@ -213,7 +213,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. vendor.google.google_battery - 1 + 2 IGoogleBattery default From 9e9cfe6b33aacf974b41527af49e789bf2d63672 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Wed, 14 Jun 2023 21:25:32 +0300 Subject: [PATCH 25/56] Merge tag 'android-13.0.0_r51' into staging/lineage-20_merge-android-13.0.0_r51 Android 13.0.0 Release 51 (TQ3A.230605.011) # -----BEGIN PGP SIGNATURE----- # # iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZIiyXQAKCRDorT+BmrEO # eD8mAJwJkLcU5ZdoUXREoflJq3bKWD0waQCdEBIBNiTRyepaxYPTXEVhNt0voOU= # =tDnG # -----END PGP SIGNATURE----- # gpg: Signature made Tue Jun 13 21:15:57 2023 EEST # gpg: using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78 # gpg: Good signature from "The Android Open Source Project " [marginal] # gpg: initial-contribution@android.com: Verified 1750 signatures in the past # 19 months. Encrypted 4 messages in the past 17 months. # gpg: WARNING: This key is not certified with sufficiently trusted signatures! # gpg: It is not certain that the signature belongs to the owner. # Primary key fingerprint: 4340 D135 70EF 945E 8381 0964 E8AD 3F81 9AB1 0E78 # By Enzo Liao # Via Android Build Coastguard Worker (2) and Enzo Liao (1) * tag 'android-13.0.0_r51': SSRestarDetector: modify the SELinux policy to allow access files owned by system for Sunfish. Change-Id: Ibdc92246fac32a5acefc73ded14b267987b06db6 --- sepolicy/vendor/google/ssr_detector.te | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sepolicy/vendor/google/ssr_detector.te b/sepolicy/vendor/google/ssr_detector.te index 49f175414..8a0bbe31b 100644 --- a/sepolicy/vendor/google/ssr_detector.te +++ b/sepolicy/vendor/google/ssr_detector.te @@ -15,7 +15,8 @@ get_prop(ssr_detector_app, vendor_wifi_version) get_prop(ssr_detector_app, public_vendor_system_prop) # ssr_detector app's data type is system_app_data_file. -allow ssr_detector_app system_app_data_file:dir { getattr search }; +allow ssr_detector_app system_app_data_file:dir create_dir_perms; +allow ssr_detector_app system_app_data_file:file create_file_perms; allow ssr_detector_app cgroup:file w_file_perms; From 11d7e4698d52bebc8d3e08bf02c6da18c166ef59 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Wed, 14 Jun 2023 03:03:28 +0530 Subject: [PATCH 26/56] proprietary-files: TQ3A.230605.011 Change-Id: I1a483e35c030d4368db338d5acb1839b4951918e --- proprietary-files-vendor.txt | 3 ++- proprietary-files.txt | 40 +++++++++++++++++++++++++++++++++++- 2 files changed, 41 insertions(+), 2 deletions(-) diff --git a/proprietary-files-vendor.txt b/proprietary-files-vendor.txt index 815b75640..7f44834f1 100644 --- a/proprietary-files-vendor.txt +++ b/proprietary-files-vendor.txt @@ -1298,7 +1298,7 @@ vendor/lib64/vendor.display.color@1.0.so vendor/lib64/vendor.display.color@1.1.so vendor/lib64/vendor.display.color@1.2.so vendor/lib64/vendor.display.postproc@1.0.so -vendor/lib64/vendor.google.google_battery-V1-ndk.so +vendor/lib64/vendor.google.google_battery-V2-ndk.so vendor/lib64/vendor.google.radioext@1.0.so vendor/lib64/vendor.google.radioext@1.1.so vendor/lib64/vendor.google.radioext@1.2.so @@ -1397,6 +1397,7 @@ vendor/radio/qcril_database/upgrade/14_add_fr_normal_ecc.sql vendor/radio/qcril_database/upgrade/15_fr_normal_ecc_on_wifi.sql vendor/radio/qcril_database/upgrade/16_ch_normal_ecc.sql vendor/radio/qcril_database/upgrade/17_in_normal_ecc.sql +vendor/radio/qcril_database/upgrade/18_add_re_and_gp_normal_ecc.sql vendor/radio/qcril_database/upgrade/1_version_intro.sql vendor/radio/qcril_database/upgrade/2_version_add_wps_config.sql vendor/radio/qcril_database/upgrade/3_version_update_wps_config.sql diff --git a/proprietary-files.txt b/proprietary-files.txt index 3b3951975..7b01db000 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -51,6 +51,7 @@ product/framework/uimservicelibrary.jar # Radio product/etc/CarrierSettings/1and1_de.pb +product/etc/CarrierSettings/2degrees_nz.pb product/etc/CarrierSettings/a1_at.pb product/etc/CarrierSettings/ahamo_jp.pb product/etc/CarrierSettings/airtel_in.pb @@ -60,8 +61,8 @@ product/etc/CarrierSettings/assurance_us.pb product/etc/CarrierSettings/astca_as.pb product/etc/CarrierSettings/att5g_us.pb product/etc/CarrierSettings/att5gsa_us.pb -product/etc/CarrierSettings/attmvnos_us.pb product/etc/CarrierSettings/att_us.pb +product/etc/CarrierSettings/attmvnos_us.pb product/etc/CarrierSettings/base_be.pb product/etc/CarrierSettings/bell_ca.pb product/etc/CarrierSettings/bluegrass_us.pb @@ -75,12 +76,16 @@ product/etc/CarrierSettings/carrier_list.pb product/etc/CarrierSettings/celcom_my.pb product/etc/CarrierSettings/cellcom_us.pb product/etc/CarrierSettings/cellcommno_us.pb +product/etc/CarrierSettings/celluarone_us.pb product/etc/CarrierSettings/chatr_ca.pb +product/etc/CarrierSettings/chinamobile_hk.pb product/etc/CarrierSettings/cht_tw.pb product/etc/CarrierSettings/cityfone_ca.pb product/etc/CarrierSettings/claro_pr.pb product/etc/CarrierSettings/congstar_de.pb +product/etc/CarrierSettings/consumercellularatt_us.pb product/etc/CarrierSettings/consumercellulartmo_us.pb +product/etc/CarrierSettings/coppervalley_us.pb product/etc/CarrierSettings/coriolis_fr.pb product/etc/CarrierSettings/cricket5g_us.pb product/etc/CarrierSettings/cricket_us.pb @@ -89,13 +94,19 @@ product/etc/CarrierSettings/cspire_us.pb product/etc/CarrierSettings/default.pb product/etc/CarrierSettings/digi_my.pb product/etc/CarrierSettings/dishatt_us.pb +product/etc/CarrierSettings/dito_ph.pb +product/etc/CarrierSettings/dna_fi.pb product/etc/CarrierSettings/docomo_jp.pb product/etc/CarrierSettings/docomomvno_jp.pb +product/etc/CarrierSettings/eastlink_ca.pb product/etc/CarrierSettings/ee_gb.pb product/etc/CarrierSettings/eir_ie.pb product/etc/CarrierSettings/eplus_de.pb product/etc/CarrierSettings/esn_gb.pb +product/etc/CarrierSettings/euskaltel_es.pb +product/etc/CarrierSettings/fastweb_it.pb product/etc/CarrierSettings/fet_tw.pb +product/etc/CarrierSettings/fi_at.pb product/etc/CarrierSettings/fi_us.pb product/etc/CarrierSettings/fido_ca.pb product/etc/CarrierSettings/firstnet_us.pb @@ -108,6 +119,7 @@ product/etc/CarrierSettings/gamma_gb.pb product/etc/CarrierSettings/gci_us.pb product/etc/CarrierSettings/gibtel_gi.pb product/etc/CarrierSettings/giga_sg.pb +product/etc/CarrierSettings/globe_ph.pb product/etc/CarrierSettings/h3_at.pb product/etc/CarrierSettings/h3_gb.pb product/etc/CarrierSettings/h3_ie.pb @@ -128,29 +140,42 @@ product/etc/CarrierSettings/liberty_pr.pb product/etc/CarrierSettings/linemo_jp.pb product/etc/CarrierSettings/luckymobile_ca.pb product/etc/CarrierSettings/m1_sg.pb +product/etc/CarrierSettings/manxcontract_im.pb +product/etc/CarrierSettings/manxprepaid_im.pb product/etc/CarrierSettings/maxis_my.pb product/etc/CarrierSettings/meo_pt.pb product/etc/CarrierSettings/metropcs_us.pb product/etc/CarrierSettings/movistar_es.pb product/etc/CarrierSettings/nextech_us.pb product/etc/CarrierSettings/nos_pt.pb +product/etc/CarrierSettings/o2_cz.pb product/etc/CarrierSettings/o2_de.pb +product/etc/CarrierSettings/o2_sk.pb product/etc/CarrierSettings/o2postpaid_gb.pb product/etc/CarrierSettings/o2prepaid_de.pb product/etc/CarrierSettings/o2prepaid_gb.pb product/etc/CarrierSettings/onecall_no.pb +product/etc/CarrierSettings/ooredoo_qa.pb product/etc/CarrierSettings/optus_au.pb product/etc/CarrierSettings/orange_be.pb product/etc/CarrierSettings/orange_es.pb product/etc/CarrierSettings/orange_fr.pb +product/etc/CarrierSettings/orange_gp.pb +product/etc/CarrierSettings/orange_lu.pb +product/etc/CarrierSettings/orange_pl.pb product/etc/CarrierSettings/orange_re.pb +product/etc/CarrierSettings/orange_ro.pb +product/etc/CarrierSettings/orange_sk.pb product/etc/CarrierSettings/others.pb product/etc/CarrierSettings/partner_il.pb product/etc/CarrierSettings/pcmobilebell_ca.pb product/etc/CarrierSettings/pelephone_il.pb +product/etc/CarrierSettings/pepephone_es.pb product/etc/CarrierSettings/play_pl.pb +product/etc/CarrierSettings/plus_pl.pb product/etc/CarrierSettings/post_lu.pb product/etc/CarrierSettings/povo_jp.pb +product/etc/CarrierSettings/proximus_be.pb product/etc/CarrierSettings/publicmobile_ca.pb product/etc/CarrierSettings/rakuten_jp.pb product/etc/CarrierSettings/redpocketatt_us.pb @@ -158,12 +183,15 @@ product/etc/CarrierSettings/redpockettmo_us.pb product/etc/CarrierSettings/rjio_in.pb product/etc/CarrierSettings/rogers5g_ca.pb product/etc/CarrierSettings/rogers_ca.pb +product/etc/CarrierSettings/salt_ch.pb +product/etc/CarrierSettings/sasktel_ca.pb product/etc/CarrierSettings/sfr_fr.pb product/etc/CarrierSettings/shaw_ca.pb product/etc/CarrierSettings/simba_sg.pb product/etc/CarrierSettings/simple_us.pb product/etc/CarrierSettings/singtel_sg.pb product/etc/CarrierSettings/skinny_nz.pb +product/etc/CarrierSettings/sky_gb.pb product/etc/CarrierSettings/smarty_gb.pb product/etc/CarrierSettings/softbank_jp.pb product/etc/CarrierSettings/solomobile_ca.pb @@ -202,6 +230,7 @@ product/etc/CarrierSettings/telia_no.pb product/etc/CarrierSettings/telia_se.pb product/etc/CarrierSettings/telstra_au.pb product/etc/CarrierSettings/telus_ca.pb +product/etc/CarrierSettings/tesco_gb.pb product/etc/CarrierSettings/three_dk.pb product/etc/CarrierSettings/tim_it.pb product/etc/CarrierSettings/tmobile_at.pb @@ -210,11 +239,18 @@ product/etc/CarrierSettings/tmobile_nl.pb product/etc/CarrierSettings/tmobile_us.pb product/etc/CarrierSettings/tmomvno_nl.pb product/etc/CarrierSettings/tmomvno_us.pb +product/etc/CarrierSettings/tracfoneatt_us.pb product/etc/CarrierSettings/tracfonetmo_us.pb product/etc/CarrierSettings/tracfoneverizon_us.pb product/etc/CarrierSettings/truemove_th.pb product/etc/CarrierSettings/tstar_tw.pb product/etc/CarrierSettings/twm_tw.pb +product/etc/CarrierSettings/u264a_ca.pb +product/etc/CarrierSettings/u264a_us.pb +product/etc/CarrierSettings/u264ao_at.pb +product/etc/CarrierSettings/u264ap_at.pb +product/etc/CarrierSettings/ultra_us.pb +product/etc/CarrierSettings/umobile_my.pb product/etc/CarrierSettings/unifi_my.pb product/etc/CarrierSettings/uqmobile_jp.pb product/etc/CarrierSettings/uscc_us.pb @@ -240,6 +276,7 @@ product/etc/CarrierSettings/vodafone_it.pb product/etc/CarrierSettings/vodafone_nl.pb product/etc/CarrierSettings/vodafone_nz.pb product/etc/CarrierSettings/vodafone_pt.pb +product/etc/CarrierSettings/vodafone_ro.pb product/etc/CarrierSettings/vodafone_tr.pb product/etc/CarrierSettings/windtre_it.pb product/etc/CarrierSettings/xfinity_us.pb @@ -247,6 +284,7 @@ product/etc/CarrierSettings/yes_my.pb product/etc/CarrierSettings/yettel_hu.pb product/etc/CarrierSettings/yoigo_es.pb product/etc/CarrierSettings/zain_kw.pb +product/etc/CarrierSettings/zeop_re.pb product/etc/permissions/com.android.sdm.plugins.connmo.xml product/etc/permissions/com.android.sdm.plugins.dcmo.xml product/etc/permissions/com.android.sdm.plugins.diagmon.xml From a678f42a62b7932ebd84d84dae8f75fe22054a5f Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Wed, 14 Jun 2023 23:14:34 +0300 Subject: [PATCH 27/56] Update fingerprint/build description from TQ3A.230605.011 Change-Id: If289d1249030a45bbe2fda8621da3c7d3aff2321 --- aosp_sunfish.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/aosp_sunfish.mk b/aosp_sunfish.mk index 5a0f1e2df..9dc4ff8e4 100644 --- a/aosp_sunfish.mk +++ b/aosp_sunfish.mk @@ -73,8 +73,8 @@ PRODUCT_MODEL := Pixel 4a PRODUCT_BUILD_PROP_OVERRIDES += \ TARGET_PRODUCT=sunfish \ - PRIVATE_BUILD_DESC="sunfish-user 13 TQ2A.230505.002 9891397 release-keys" + PRIVATE_BUILD_DESC="sunfish-user 13 TQ3A.230605.011 10161073 release-keys" -BUILD_FINGERPRINT := google/sunfish/sunfish:13/TQ2A.230505.002/9891397:user/release-keys +BUILD_FINGERPRINT := google/sunfish/sunfish:13/TQ3A.230605.011/10161073:user/release-keys $(call inherit-product, vendor/google/sunfish/sunfish-vendor.mk) From 1e0b889cd41e25b2726b531506bd183e24ee3207 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Sat, 17 Jun 2023 12:46:20 +0300 Subject: [PATCH 28/56] CarrierSettings extract integration changes Change-Id: Ib6720bbe72612e1412c719e5e1a5164626a83aa0 --- extract-files.sh | 1 + proprietary-files-carriersettings.txt | 236 ++++++++++++++++++++++++++ proprietary-files.txt | 235 ------------------------- regen-carriersettings.sh | 47 +++++ setup-makefiles.sh | 1 + 5 files changed, 285 insertions(+), 235 deletions(-) create mode 100644 proprietary-files-carriersettings.txt create mode 100755 regen-carriersettings.sh diff --git a/extract-files.sh b/extract-files.sh index e3acff8b7..eb66c0e87 100755 --- a/extract-files.sh +++ b/extract-files.sh @@ -66,6 +66,7 @@ function blob_fixup() { setup_vendor "${DEVICE}" "${VENDOR}" "${ANDROID_ROOT}" false "${CLEAN_VENDOR}" extract "${MY_DIR}/proprietary-files.txt" "${SRC}" "${KANG}" --section "${SECTION}" +extract "${MY_DIR}/proprietary-files-carriersettings.txt" "${SRC}" "${KANG}" --section "${SECTION}" extract "${MY_DIR}/proprietary-files-vendor.txt" "${SRC}" "${KANG}" --section "${SECTION}" "${MY_DIR}/setup-makefiles.sh" diff --git a/proprietary-files-carriersettings.txt b/proprietary-files-carriersettings.txt new file mode 100644 index 000000000..240297253 --- /dev/null +++ b/proprietary-files-carriersettings.txt @@ -0,0 +1,236 @@ +# All blobs are extracted from Google factory images for each new ASB +product/etc/CarrierSettings/1and1_de.pb +product/etc/CarrierSettings/2degrees_nz.pb +product/etc/CarrierSettings/a1_at.pb +product/etc/CarrierSettings/ahamo_jp.pb +product/etc/CarrierSettings/airtel_in.pb +product/etc/CarrierSettings/ais_th.pb +product/etc/CarrierSettings/apt_tw.pb +product/etc/CarrierSettings/assurance_us.pb +product/etc/CarrierSettings/astca_as.pb +product/etc/CarrierSettings/att5g_us.pb +product/etc/CarrierSettings/att5gsa_us.pb +product/etc/CarrierSettings/att_us.pb +product/etc/CarrierSettings/attmvnos_us.pb +product/etc/CarrierSettings/base_be.pb +product/etc/CarrierSettings/bell_ca.pb +product/etc/CarrierSettings/bluegrass_us.pb +product/etc/CarrierSettings/boost_us.pb +product/etc/CarrierSettings/boosttmo_us.pb +product/etc/CarrierSettings/bouygues_fr.pb +product/etc/CarrierSettings/btb_gb.pb +product/etc/CarrierSettings/btc_gb.pb +product/etc/CarrierSettings/carolinawest_us.pb +product/etc/CarrierSettings/carrier_list.pb +product/etc/CarrierSettings/celcom_my.pb +product/etc/CarrierSettings/cellcom_us.pb +product/etc/CarrierSettings/cellcommno_us.pb +product/etc/CarrierSettings/celluarone_us.pb +product/etc/CarrierSettings/chatr_ca.pb +product/etc/CarrierSettings/chinamobile_hk.pb +product/etc/CarrierSettings/cht_tw.pb +product/etc/CarrierSettings/cityfone_ca.pb +product/etc/CarrierSettings/claro_pr.pb +product/etc/CarrierSettings/congstar_de.pb +product/etc/CarrierSettings/consumercellularatt_us.pb +product/etc/CarrierSettings/consumercellulartmo_us.pb +product/etc/CarrierSettings/coppervalley_us.pb +product/etc/CarrierSettings/coriolis_fr.pb +product/etc/CarrierSettings/cricket5g_us.pb +product/etc/CarrierSettings/cricket_us.pb +product/etc/CarrierSettings/cspire_nl.pb +product/etc/CarrierSettings/cspire_us.pb +product/etc/CarrierSettings/default.pb +product/etc/CarrierSettings/digi_my.pb +product/etc/CarrierSettings/dishatt_us.pb +product/etc/CarrierSettings/dito_ph.pb +product/etc/CarrierSettings/dna_fi.pb +product/etc/CarrierSettings/docomo_jp.pb +product/etc/CarrierSettings/docomomvno_jp.pb +product/etc/CarrierSettings/eastlink_ca.pb +product/etc/CarrierSettings/ee_gb.pb +product/etc/CarrierSettings/eir_ie.pb +product/etc/CarrierSettings/eplus_de.pb +product/etc/CarrierSettings/esn_gb.pb +product/etc/CarrierSettings/euskaltel_es.pb +product/etc/CarrierSettings/fastweb_it.pb +product/etc/CarrierSettings/fet_tw.pb +product/etc/CarrierSettings/fi_at.pb +product/etc/CarrierSettings/fi_us.pb +product/etc/CarrierSettings/fido_ca.pb +product/etc/CarrierSettings/firstnet_us.pb +product/etc/CarrierSettings/firstnetpacific2_us.pb +product/etc/CarrierSettings/firstnetpacific_us.pb +product/etc/CarrierSettings/fizz_ca.pb +product/etc/CarrierSettings/free_fr.pb +product/etc/CarrierSettings/freedommobile_ca.pb +product/etc/CarrierSettings/gamma_gb.pb +product/etc/CarrierSettings/gci_us.pb +product/etc/CarrierSettings/gibtel_gi.pb +product/etc/CarrierSettings/giga_sg.pb +product/etc/CarrierSettings/globe_ph.pb +product/etc/CarrierSettings/h3_at.pb +product/etc/CarrierSettings/h3_gb.pb +product/etc/CarrierSettings/h3_ie.pb +product/etc/CarrierSettings/h3_se.pb +product/etc/CarrierSettings/h3g27202_ie.pb +product/etc/CarrierSettings/halebop_se.pb +product/etc/CarrierSettings/homobile_it.pb +product/etc/CarrierSettings/ice_no.pb +product/etc/CarrierSettings/idea_in.pb +product/etc/CarrierSettings/idmobile_gb.pb +product/etc/CarrierSettings/iliad_it.pb +product/etc/CarrierSettings/kddi_jp.pb +product/etc/CarrierSettings/kddimvno_jp.pb +product/etc/CarrierSettings/kena_it.pb +product/etc/CarrierSettings/koodo_ca.pb +product/etc/CarrierSettings/kpn_nl.pb +product/etc/CarrierSettings/liberty_pr.pb +product/etc/CarrierSettings/linemo_jp.pb +product/etc/CarrierSettings/luckymobile_ca.pb +product/etc/CarrierSettings/m1_sg.pb +product/etc/CarrierSettings/manxcontract_im.pb +product/etc/CarrierSettings/manxprepaid_im.pb +product/etc/CarrierSettings/maxis_my.pb +product/etc/CarrierSettings/meo_pt.pb +product/etc/CarrierSettings/metropcs_us.pb +product/etc/CarrierSettings/movistar_es.pb +product/etc/CarrierSettings/nextech_us.pb +product/etc/CarrierSettings/nos_pt.pb +product/etc/CarrierSettings/o2_cz.pb +product/etc/CarrierSettings/o2_de.pb +product/etc/CarrierSettings/o2_sk.pb +product/etc/CarrierSettings/o2postpaid_gb.pb +product/etc/CarrierSettings/o2prepaid_de.pb +product/etc/CarrierSettings/o2prepaid_gb.pb +product/etc/CarrierSettings/onecall_no.pb +product/etc/CarrierSettings/ooredoo_qa.pb +product/etc/CarrierSettings/optus_au.pb +product/etc/CarrierSettings/orange_be.pb +product/etc/CarrierSettings/orange_es.pb +product/etc/CarrierSettings/orange_fr.pb +product/etc/CarrierSettings/orange_gp.pb +product/etc/CarrierSettings/orange_lu.pb +product/etc/CarrierSettings/orange_pl.pb +product/etc/CarrierSettings/orange_re.pb +product/etc/CarrierSettings/orange_ro.pb +product/etc/CarrierSettings/orange_sk.pb +product/etc/CarrierSettings/others.pb +product/etc/CarrierSettings/partner_il.pb +product/etc/CarrierSettings/pcmobilebell_ca.pb +product/etc/CarrierSettings/pelephone_il.pb +product/etc/CarrierSettings/pepephone_es.pb +product/etc/CarrierSettings/play_pl.pb +product/etc/CarrierSettings/plus_pl.pb +product/etc/CarrierSettings/post_lu.pb +product/etc/CarrierSettings/povo_jp.pb +product/etc/CarrierSettings/proximus_be.pb +product/etc/CarrierSettings/publicmobile_ca.pb +product/etc/CarrierSettings/rakuten_jp.pb +product/etc/CarrierSettings/redpocketatt_us.pb +product/etc/CarrierSettings/redpockettmo_us.pb +product/etc/CarrierSettings/rjio_in.pb +product/etc/CarrierSettings/rogers5g_ca.pb +product/etc/CarrierSettings/rogers_ca.pb +product/etc/CarrierSettings/salt_ch.pb +product/etc/CarrierSettings/sasktel_ca.pb +product/etc/CarrierSettings/sfr_fr.pb +product/etc/CarrierSettings/shaw_ca.pb +product/etc/CarrierSettings/simba_sg.pb +product/etc/CarrierSettings/simple_us.pb +product/etc/CarrierSettings/singtel_sg.pb +product/etc/CarrierSettings/skinny_nz.pb +product/etc/CarrierSettings/sky_gb.pb +product/etc/CarrierSettings/smarty_gb.pb +product/etc/CarrierSettings/softbank_jp.pb +product/etc/CarrierSettings/solomobile_ca.pb +product/etc/CarrierSettings/spark_nz.pb +product/etc/CarrierSettings/spectrum_us.pb +product/etc/CarrierSettings/sprint_us.pb +product/etc/CarrierSettings/sprintprepaid_us.pb +product/etc/CarrierSettings/sprintwholesale_us.pb +product/etc/CarrierSettings/starhub_sg.pb +product/etc/CarrierSettings/stc_sa.pb +product/etc/CarrierSettings/strata_us.pb +product/etc/CarrierSettings/sunrise_ch.pb +product/etc/CarrierSettings/swisscom_ch.pb +product/etc/CarrierSettings/swisscom_li.pb +product/etc/CarrierSettings/talkmobile_gb.pb +product/etc/CarrierSettings/tango_us.pb +product/etc/CarrierSettings/tbaytel_ca.pb +product/etc/CarrierSettings/tchibo_de.pb +product/etc/CarrierSettings/tdc_dk.pb +product/etc/CarrierSettings/tele2_se.pb +product/etc/CarrierSettings/telekom_de.pb +product/etc/CarrierSettings/telekom_gr.pb +product/etc/CarrierSettings/telekom_hr.pb +product/etc/CarrierSettings/telekom_hu.pb +product/etc/CarrierSettings/telekom_pl.pb +product/etc/CarrierSettings/telekom_sk.pb +product/etc/CarrierSettings/telenet_be.pb +product/etc/CarrierSettings/telenor_dk.pb +product/etc/CarrierSettings/telenor_no.pb +product/etc/CarrierSettings/telenor_se.pb +product/etc/CarrierSettings/telia_dk.pb +product/etc/CarrierSettings/telia_ee.pb +product/etc/CarrierSettings/telia_fi.pb +product/etc/CarrierSettings/telia_lt.pb +product/etc/CarrierSettings/telia_no.pb +product/etc/CarrierSettings/telia_se.pb +product/etc/CarrierSettings/telstra_au.pb +product/etc/CarrierSettings/telus_ca.pb +product/etc/CarrierSettings/tesco_gb.pb +product/etc/CarrierSettings/three_dk.pb +product/etc/CarrierSettings/tim_it.pb +product/etc/CarrierSettings/tmobile_at.pb +product/etc/CarrierSettings/tmobile_cz.pb +product/etc/CarrierSettings/tmobile_nl.pb +product/etc/CarrierSettings/tmobile_us.pb +product/etc/CarrierSettings/tmomvno_nl.pb +product/etc/CarrierSettings/tmomvno_us.pb +product/etc/CarrierSettings/tracfoneatt_us.pb +product/etc/CarrierSettings/tracfonetmo_us.pb +product/etc/CarrierSettings/tracfoneverizon_us.pb +product/etc/CarrierSettings/truemove_th.pb +product/etc/CarrierSettings/tstar_tw.pb +product/etc/CarrierSettings/twm_tw.pb +product/etc/CarrierSettings/u264a_ca.pb +product/etc/CarrierSettings/u264a_us.pb +product/etc/CarrierSettings/u264ao_at.pb +product/etc/CarrierSettings/u264ap_at.pb +product/etc/CarrierSettings/ultra_us.pb +product/etc/CarrierSettings/umobile_my.pb +product/etc/CarrierSettings/unifi_my.pb +product/etc/CarrierSettings/uqmobile_jp.pb +product/etc/CarrierSettings/uscc_us.pb +product/etc/CarrierSettings/verizon_us.pb +product/etc/CarrierSettings/verymobile_it.pb +product/etc/CarrierSettings/viaero_us.pb +product/etc/CarrierSettings/videotron_ca.pb +product/etc/CarrierSettings/vimla_se.pb +product/etc/CarrierSettings/virgin_ca.pb +product/etc/CarrierSettings/virgin_gb.pb +product/etc/CarrierSettings/virgin_us.pb +product/etc/CarrierSettings/visible_us.pb +product/etc/CarrierSettings/visiblev_us.pb +product/etc/CarrierSettings/vodafone_au.pb +product/etc/CarrierSettings/vodafone_cz.pb +product/etc/CarrierSettings/vodafone_de.pb +product/etc/CarrierSettings/vodafone_es.pb +product/etc/CarrierSettings/vodafone_gb.pb +product/etc/CarrierSettings/vodafone_hu.pb +product/etc/CarrierSettings/vodafone_ie.pb +product/etc/CarrierSettings/vodafone_in.pb +product/etc/CarrierSettings/vodafone_it.pb +product/etc/CarrierSettings/vodafone_nl.pb +product/etc/CarrierSettings/vodafone_nz.pb +product/etc/CarrierSettings/vodafone_pt.pb +product/etc/CarrierSettings/vodafone_ro.pb +product/etc/CarrierSettings/vodafone_tr.pb +product/etc/CarrierSettings/windtre_it.pb +product/etc/CarrierSettings/xfinity_us.pb +product/etc/CarrierSettings/yes_my.pb +product/etc/CarrierSettings/yettel_hu.pb +product/etc/CarrierSettings/yoigo_es.pb +product/etc/CarrierSettings/zain_kw.pb +product/etc/CarrierSettings/zeop_re.pb diff --git a/proprietary-files.txt b/proprietary-files.txt index 7b01db000..aa622b76f 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -50,241 +50,6 @@ product/framework/uimremoteserverlibrary.jar product/framework/uimservicelibrary.jar # Radio -product/etc/CarrierSettings/1and1_de.pb -product/etc/CarrierSettings/2degrees_nz.pb -product/etc/CarrierSettings/a1_at.pb -product/etc/CarrierSettings/ahamo_jp.pb -product/etc/CarrierSettings/airtel_in.pb -product/etc/CarrierSettings/ais_th.pb -product/etc/CarrierSettings/apt_tw.pb -product/etc/CarrierSettings/assurance_us.pb -product/etc/CarrierSettings/astca_as.pb -product/etc/CarrierSettings/att5g_us.pb -product/etc/CarrierSettings/att5gsa_us.pb -product/etc/CarrierSettings/att_us.pb -product/etc/CarrierSettings/attmvnos_us.pb -product/etc/CarrierSettings/base_be.pb -product/etc/CarrierSettings/bell_ca.pb -product/etc/CarrierSettings/bluegrass_us.pb -product/etc/CarrierSettings/boost_us.pb -product/etc/CarrierSettings/boosttmo_us.pb -product/etc/CarrierSettings/bouygues_fr.pb -product/etc/CarrierSettings/btb_gb.pb -product/etc/CarrierSettings/btc_gb.pb -product/etc/CarrierSettings/carolinawest_us.pb -product/etc/CarrierSettings/carrier_list.pb -product/etc/CarrierSettings/celcom_my.pb -product/etc/CarrierSettings/cellcom_us.pb -product/etc/CarrierSettings/cellcommno_us.pb -product/etc/CarrierSettings/celluarone_us.pb -product/etc/CarrierSettings/chatr_ca.pb -product/etc/CarrierSettings/chinamobile_hk.pb -product/etc/CarrierSettings/cht_tw.pb -product/etc/CarrierSettings/cityfone_ca.pb -product/etc/CarrierSettings/claro_pr.pb -product/etc/CarrierSettings/congstar_de.pb -product/etc/CarrierSettings/consumercellularatt_us.pb -product/etc/CarrierSettings/consumercellulartmo_us.pb -product/etc/CarrierSettings/coppervalley_us.pb -product/etc/CarrierSettings/coriolis_fr.pb -product/etc/CarrierSettings/cricket5g_us.pb -product/etc/CarrierSettings/cricket_us.pb -product/etc/CarrierSettings/cspire_nl.pb -product/etc/CarrierSettings/cspire_us.pb -product/etc/CarrierSettings/default.pb -product/etc/CarrierSettings/digi_my.pb -product/etc/CarrierSettings/dishatt_us.pb -product/etc/CarrierSettings/dito_ph.pb -product/etc/CarrierSettings/dna_fi.pb -product/etc/CarrierSettings/docomo_jp.pb -product/etc/CarrierSettings/docomomvno_jp.pb -product/etc/CarrierSettings/eastlink_ca.pb -product/etc/CarrierSettings/ee_gb.pb -product/etc/CarrierSettings/eir_ie.pb -product/etc/CarrierSettings/eplus_de.pb -product/etc/CarrierSettings/esn_gb.pb -product/etc/CarrierSettings/euskaltel_es.pb -product/etc/CarrierSettings/fastweb_it.pb -product/etc/CarrierSettings/fet_tw.pb -product/etc/CarrierSettings/fi_at.pb -product/etc/CarrierSettings/fi_us.pb -product/etc/CarrierSettings/fido_ca.pb -product/etc/CarrierSettings/firstnet_us.pb -product/etc/CarrierSettings/firstnetpacific2_us.pb -product/etc/CarrierSettings/firstnetpacific_us.pb -product/etc/CarrierSettings/fizz_ca.pb -product/etc/CarrierSettings/free_fr.pb -product/etc/CarrierSettings/freedommobile_ca.pb -product/etc/CarrierSettings/gamma_gb.pb -product/etc/CarrierSettings/gci_us.pb -product/etc/CarrierSettings/gibtel_gi.pb -product/etc/CarrierSettings/giga_sg.pb -product/etc/CarrierSettings/globe_ph.pb -product/etc/CarrierSettings/h3_at.pb -product/etc/CarrierSettings/h3_gb.pb -product/etc/CarrierSettings/h3_ie.pb -product/etc/CarrierSettings/h3_se.pb -product/etc/CarrierSettings/h3g27202_ie.pb -product/etc/CarrierSettings/halebop_se.pb -product/etc/CarrierSettings/homobile_it.pb -product/etc/CarrierSettings/ice_no.pb -product/etc/CarrierSettings/idea_in.pb -product/etc/CarrierSettings/idmobile_gb.pb -product/etc/CarrierSettings/iliad_it.pb -product/etc/CarrierSettings/kddi_jp.pb -product/etc/CarrierSettings/kddimvno_jp.pb -product/etc/CarrierSettings/kena_it.pb -product/etc/CarrierSettings/koodo_ca.pb -product/etc/CarrierSettings/kpn_nl.pb -product/etc/CarrierSettings/liberty_pr.pb -product/etc/CarrierSettings/linemo_jp.pb -product/etc/CarrierSettings/luckymobile_ca.pb -product/etc/CarrierSettings/m1_sg.pb -product/etc/CarrierSettings/manxcontract_im.pb -product/etc/CarrierSettings/manxprepaid_im.pb -product/etc/CarrierSettings/maxis_my.pb -product/etc/CarrierSettings/meo_pt.pb -product/etc/CarrierSettings/metropcs_us.pb -product/etc/CarrierSettings/movistar_es.pb -product/etc/CarrierSettings/nextech_us.pb -product/etc/CarrierSettings/nos_pt.pb -product/etc/CarrierSettings/o2_cz.pb -product/etc/CarrierSettings/o2_de.pb -product/etc/CarrierSettings/o2_sk.pb -product/etc/CarrierSettings/o2postpaid_gb.pb -product/etc/CarrierSettings/o2prepaid_de.pb -product/etc/CarrierSettings/o2prepaid_gb.pb -product/etc/CarrierSettings/onecall_no.pb -product/etc/CarrierSettings/ooredoo_qa.pb -product/etc/CarrierSettings/optus_au.pb -product/etc/CarrierSettings/orange_be.pb -product/etc/CarrierSettings/orange_es.pb -product/etc/CarrierSettings/orange_fr.pb -product/etc/CarrierSettings/orange_gp.pb -product/etc/CarrierSettings/orange_lu.pb -product/etc/CarrierSettings/orange_pl.pb -product/etc/CarrierSettings/orange_re.pb -product/etc/CarrierSettings/orange_ro.pb -product/etc/CarrierSettings/orange_sk.pb -product/etc/CarrierSettings/others.pb -product/etc/CarrierSettings/partner_il.pb -product/etc/CarrierSettings/pcmobilebell_ca.pb -product/etc/CarrierSettings/pelephone_il.pb -product/etc/CarrierSettings/pepephone_es.pb -product/etc/CarrierSettings/play_pl.pb -product/etc/CarrierSettings/plus_pl.pb -product/etc/CarrierSettings/post_lu.pb -product/etc/CarrierSettings/povo_jp.pb -product/etc/CarrierSettings/proximus_be.pb -product/etc/CarrierSettings/publicmobile_ca.pb -product/etc/CarrierSettings/rakuten_jp.pb -product/etc/CarrierSettings/redpocketatt_us.pb -product/etc/CarrierSettings/redpockettmo_us.pb -product/etc/CarrierSettings/rjio_in.pb -product/etc/CarrierSettings/rogers5g_ca.pb -product/etc/CarrierSettings/rogers_ca.pb -product/etc/CarrierSettings/salt_ch.pb -product/etc/CarrierSettings/sasktel_ca.pb -product/etc/CarrierSettings/sfr_fr.pb -product/etc/CarrierSettings/shaw_ca.pb -product/etc/CarrierSettings/simba_sg.pb -product/etc/CarrierSettings/simple_us.pb -product/etc/CarrierSettings/singtel_sg.pb -product/etc/CarrierSettings/skinny_nz.pb -product/etc/CarrierSettings/sky_gb.pb -product/etc/CarrierSettings/smarty_gb.pb -product/etc/CarrierSettings/softbank_jp.pb -product/etc/CarrierSettings/solomobile_ca.pb -product/etc/CarrierSettings/spark_nz.pb -product/etc/CarrierSettings/spectrum_us.pb -product/etc/CarrierSettings/sprint_us.pb -product/etc/CarrierSettings/sprintprepaid_us.pb -product/etc/CarrierSettings/sprintwholesale_us.pb -product/etc/CarrierSettings/starhub_sg.pb -product/etc/CarrierSettings/stc_sa.pb -product/etc/CarrierSettings/strata_us.pb -product/etc/CarrierSettings/sunrise_ch.pb -product/etc/CarrierSettings/swisscom_ch.pb -product/etc/CarrierSettings/swisscom_li.pb -product/etc/CarrierSettings/talkmobile_gb.pb -product/etc/CarrierSettings/tango_us.pb -product/etc/CarrierSettings/tbaytel_ca.pb -product/etc/CarrierSettings/tchibo_de.pb -product/etc/CarrierSettings/tdc_dk.pb -product/etc/CarrierSettings/tele2_se.pb -product/etc/CarrierSettings/telekom_de.pb -product/etc/CarrierSettings/telekom_gr.pb -product/etc/CarrierSettings/telekom_hr.pb -product/etc/CarrierSettings/telekom_hu.pb -product/etc/CarrierSettings/telekom_pl.pb -product/etc/CarrierSettings/telekom_sk.pb -product/etc/CarrierSettings/telenet_be.pb -product/etc/CarrierSettings/telenor_dk.pb -product/etc/CarrierSettings/telenor_no.pb -product/etc/CarrierSettings/telenor_se.pb -product/etc/CarrierSettings/telia_dk.pb -product/etc/CarrierSettings/telia_ee.pb -product/etc/CarrierSettings/telia_fi.pb -product/etc/CarrierSettings/telia_lt.pb -product/etc/CarrierSettings/telia_no.pb -product/etc/CarrierSettings/telia_se.pb -product/etc/CarrierSettings/telstra_au.pb -product/etc/CarrierSettings/telus_ca.pb -product/etc/CarrierSettings/tesco_gb.pb -product/etc/CarrierSettings/three_dk.pb -product/etc/CarrierSettings/tim_it.pb -product/etc/CarrierSettings/tmobile_at.pb -product/etc/CarrierSettings/tmobile_cz.pb -product/etc/CarrierSettings/tmobile_nl.pb -product/etc/CarrierSettings/tmobile_us.pb -product/etc/CarrierSettings/tmomvno_nl.pb -product/etc/CarrierSettings/tmomvno_us.pb -product/etc/CarrierSettings/tracfoneatt_us.pb -product/etc/CarrierSettings/tracfonetmo_us.pb -product/etc/CarrierSettings/tracfoneverizon_us.pb -product/etc/CarrierSettings/truemove_th.pb -product/etc/CarrierSettings/tstar_tw.pb -product/etc/CarrierSettings/twm_tw.pb -product/etc/CarrierSettings/u264a_ca.pb -product/etc/CarrierSettings/u264a_us.pb -product/etc/CarrierSettings/u264ao_at.pb -product/etc/CarrierSettings/u264ap_at.pb -product/etc/CarrierSettings/ultra_us.pb -product/etc/CarrierSettings/umobile_my.pb -product/etc/CarrierSettings/unifi_my.pb -product/etc/CarrierSettings/uqmobile_jp.pb -product/etc/CarrierSettings/uscc_us.pb -product/etc/CarrierSettings/verizon_us.pb -product/etc/CarrierSettings/verymobile_it.pb -product/etc/CarrierSettings/viaero_us.pb -product/etc/CarrierSettings/videotron_ca.pb -product/etc/CarrierSettings/vimla_se.pb -product/etc/CarrierSettings/virgin_ca.pb -product/etc/CarrierSettings/virgin_gb.pb -product/etc/CarrierSettings/virgin_us.pb -product/etc/CarrierSettings/visible_us.pb -product/etc/CarrierSettings/visiblev_us.pb -product/etc/CarrierSettings/vodafone_au.pb -product/etc/CarrierSettings/vodafone_cz.pb -product/etc/CarrierSettings/vodafone_de.pb -product/etc/CarrierSettings/vodafone_es.pb -product/etc/CarrierSettings/vodafone_gb.pb -product/etc/CarrierSettings/vodafone_hu.pb -product/etc/CarrierSettings/vodafone_ie.pb -product/etc/CarrierSettings/vodafone_in.pb -product/etc/CarrierSettings/vodafone_it.pb -product/etc/CarrierSettings/vodafone_nl.pb -product/etc/CarrierSettings/vodafone_nz.pb -product/etc/CarrierSettings/vodafone_pt.pb -product/etc/CarrierSettings/vodafone_ro.pb -product/etc/CarrierSettings/vodafone_tr.pb -product/etc/CarrierSettings/windtre_it.pb -product/etc/CarrierSettings/xfinity_us.pb -product/etc/CarrierSettings/yes_my.pb -product/etc/CarrierSettings/yettel_hu.pb -product/etc/CarrierSettings/yoigo_es.pb -product/etc/CarrierSettings/zain_kw.pb -product/etc/CarrierSettings/zeop_re.pb product/etc/permissions/com.android.sdm.plugins.connmo.xml product/etc/permissions/com.android.sdm.plugins.dcmo.xml product/etc/permissions/com.android.sdm.plugins.diagmon.xml diff --git a/regen-carriersettings.sh b/regen-carriersettings.sh new file mode 100755 index 000000000..5bc5b9a9a --- /dev/null +++ b/regen-carriersettings.sh @@ -0,0 +1,47 @@ +#!/bin/bash +# +# Copyright (C) 2019-2023 The LineageOS Project +# +# SPDX-License-Identifier: Apache-2.0 +# + +set -e + +# Load extract_utils and do some sanity checks +MY_DIR="${BASH_SOURCE%/*}" +if [[ ! -d "${MY_DIR}" ]]; then MY_DIR="${PWD}"; fi + +ANDROID_ROOT="${MY_DIR}/../../.." + +HELPER="${ANDROID_ROOT}/tools/extract-utils/extract_utils.sh" +if [ ! -f "${HELPER}" ]; then + echo "Unable to find helper script at ${HELPER}" + exit 1 +fi +source "${HELPER}" + +_input_image="${1}" +_output_file="${2}" + +if [ -z "${_input_image}" ]; then + echo "No input image supplied" + exit 1 +fi + +if [ -z "${_output_file}" ]; then + echo "No output filename supplied" + exit 1 +fi + +CARRIER_SKIP_FILES=() + +# Initialize the helper +setup_vendor_deps "${ANDROID_ROOT}" + +generate_prop_list_from_image "${_input_image}" "${_output_file}" CARRIER_SKIP_FILES carriersettings + +function header() { + sed -i "1s/^/${1}\n/" "${_output_file}" +} + +header "# All blobs are extracted from Google factory images for each new ASB" diff --git a/setup-makefiles.sh b/setup-makefiles.sh index 5535bf3dc..bc8f3c203 100755 --- a/setup-makefiles.sh +++ b/setup-makefiles.sh @@ -31,6 +31,7 @@ setup_vendor "${DEVICE}" "${VENDOR}" "${ANDROID_ROOT}" write_headers write_makefiles "${MY_DIR}/proprietary-files.txt" true +write_makefiles "${MY_DIR}/proprietary-files-carriersettings.txt" true write_makefiles "${MY_DIR}/proprietary-files-vendor.txt" true # Finish From a5797b86b368c7abec4b7c9007db64d2c7fa844b Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Sat, 8 Jul 2023 13:17:35 +0300 Subject: [PATCH 29/56] Update fingerprint/build description from TQ3A.230705.001 Change-Id: If721275b3296b603a6a42c9263f30c29867950a7 --- aosp_sunfish.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/aosp_sunfish.mk b/aosp_sunfish.mk index 9dc4ff8e4..202baaf3f 100644 --- a/aosp_sunfish.mk +++ b/aosp_sunfish.mk @@ -73,8 +73,8 @@ PRODUCT_MODEL := Pixel 4a PRODUCT_BUILD_PROP_OVERRIDES += \ TARGET_PRODUCT=sunfish \ - PRIVATE_BUILD_DESC="sunfish-user 13 TQ3A.230605.011 10161073 release-keys" + PRIVATE_BUILD_DESC="sunfish-user 13 TQ3A.230705.001 10216780 release-keys" -BUILD_FINGERPRINT := google/sunfish/sunfish:13/TQ3A.230605.011/10161073:user/release-keys +BUILD_FINGERPRINT := google/sunfish/sunfish:13/TQ3A.230705.001/10216780:user/release-keys $(call inherit-product, vendor/google/sunfish/sunfish-vendor.mk) From 11d0b471e0e2291ba34b9430ebeaa2dd14a36986 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Wed, 9 Aug 2023 04:21:57 +0300 Subject: [PATCH 30/56] Merge tag 'android-13.0.0_r67' into staging/lineage-20_merge-android-13.0.0_r67 Android 13.0.0 Release 67 (TQ3A.230805.001) # -----BEGIN PGP SIGNATURE----- # # iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZNFQIgAKCRDorT+BmrEO # eCbTAJwM+z1vLFU9cFVs+9TRfCZX7xhaTQCbBbc/oPnjS6D7UflXDVzCDg5E2cY= # =lEwP # -----END PGP SIGNATURE----- # gpg: Signature made Mon Aug 7 23:12:18 2023 EEST # gpg: using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78 # gpg: Good signature from "The Android Open Source Project " [marginal] # gpg: initial-contribution@android.com: Verified 1818 signatures in the past # 21 months. Encrypted 4 messages in the past 19 months. # gpg: WARNING: This key is not certified with sufficiently trusted signatures! # gpg: It is not certain that the signature belongs to the owner. # Primary key fingerprint: 4340 D135 70EF 945E 8381 0964 E8AD 3F81 9AB1 0E78 # By Lokesh Kumar Goel # Via Android Build Coastguard Worker * tag 'android-13.0.0_r67': Update sunfish SVN to 63 Change-Id: I16dacbdd197ecb485e84ae653489e145799233a9 --- device.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device.mk b/device.mk index d9a432b8d..4af3d41ff 100644 --- a/device.mk +++ b/device.mk @@ -1058,7 +1058,7 @@ PRODUCT_PACKAGES += $(HIDL_WRAPPER) # Increment the SVN for any official public releases PRODUCT_PROPERTY_OVERRIDES += \ - ro.vendor.build.svn=62 + ro.vendor.build.svn=63 PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/powerhint.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.json From 66cc7d2de78b2d82a77e101c251a8b7b76d138d2 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Sat, 12 Aug 2023 12:05:44 +0300 Subject: [PATCH 31/56] Update fingerprint/build description from TQ3A.230805.001 Change-Id: I8e24b4edab222611911c96f4741fbf24cc6599c4 --- aosp_sunfish.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/aosp_sunfish.mk b/aosp_sunfish.mk index 202baaf3f..0da4013b7 100644 --- a/aosp_sunfish.mk +++ b/aosp_sunfish.mk @@ -73,8 +73,8 @@ PRODUCT_MODEL := Pixel 4a PRODUCT_BUILD_PROP_OVERRIDES += \ TARGET_PRODUCT=sunfish \ - PRIVATE_BUILD_DESC="sunfish-user 13 TQ3A.230705.001 10216780 release-keys" + PRIVATE_BUILD_DESC="sunfish-user 13 TQ3A.230805.001 10316531 release-keys" -BUILD_FINGERPRINT := google/sunfish/sunfish:13/TQ3A.230705.001/10216780:user/release-keys +BUILD_FINGERPRINT := google/sunfish/sunfish:13/TQ3A.230805.001/10316531:user/release-keys $(call inherit-product, vendor/google/sunfish/sunfish-vendor.mk) From ef4a415d628375d2eaa89379a25c1dbb759cf8c4 Mon Sep 17 00:00:00 2001 From: PixelBoot Date: Sat, 2 Sep 2023 21:34:45 +0200 Subject: [PATCH 32/56] sunfish: Bring-up PixelBuilds --- aosp_sunfish.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aosp_sunfish.mk b/aosp_sunfish.mk index 0da4013b7..515331d91 100644 --- a/aosp_sunfish.mk +++ b/aosp_sunfish.mk @@ -44,7 +44,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_vendor.mk) # Inherit some common PixelExperience stuff TARGET_BOOT_ANIMATION_RES := 1080 TARGET_GAPPS_ARCH := arm64 -$(call inherit-product, vendor/aosp/config/common_full_phone.mk) +$(call inherit-product, vendor/pb/config/common_full_phone.mk) $(call inherit-product, device/google/sunfish/device-sunfish.mk) $(call inherit-product-if-exists, vendor/google_devices/sunfish/proprietary/device-vendor.mk) From 8e86edcfffcb00ee87aa26f652d15d49c54c53e1 Mon Sep 17 00:00:00 2001 From: PixelBoot Date: Sat, 7 Oct 2023 22:33:20 +0200 Subject: [PATCH 33/56] Nitrogen --- AndroidProducts.mk | 2 ++ aosp_sunfish.mk | 19 +++---------------- nitrogen_sunfish.mk | 29 +++++++++++++++++++++++++++++ 3 files changed, 34 insertions(+), 16 deletions(-) create mode 100644 nitrogen_sunfish.mk diff --git a/AndroidProducts.mk b/AndroidProducts.mk index d9d370993..d24462793 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -17,6 +17,8 @@ PRODUCT_MAKEFILES := \ $(LOCAL_DIR)/aosp_sunfish.mk \ $(LOCAL_DIR)/aosp_sunfish_hwasan.mk \ + $(LOCAL_DIR)/nitrogen_sunfish.mk \ COMMON_LUNCH_CHOICES := \ aosp_sunfish-userdebug \ + nitrogen_sunfish-userdebug diff --git a/aosp_sunfish.mk b/aosp_sunfish.mk index 515331d91..573dc6b87 100644 --- a/aosp_sunfish.mk +++ b/aosp_sunfish.mk @@ -21,7 +21,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/generic_system.mk) # Enable mainline checking -#PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := strict +PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := strict # # All components inherited here go to system_ext image @@ -41,11 +41,6 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_vendor.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_vendor.mk) -# Inherit some common PixelExperience stuff -TARGET_BOOT_ANIMATION_RES := 1080 -TARGET_GAPPS_ARCH := arm64 -$(call inherit-product, vendor/pb/config/common_full_phone.mk) - $(call inherit-product, device/google/sunfish/device-sunfish.mk) $(call inherit-product-if-exists, vendor/google_devices/sunfish/proprietary/device-vendor.mk) $(call inherit-product-if-exists, vendor/google_devices/sunfish/prebuilts/device-vendor-sunfish.mk) @@ -66,15 +61,7 @@ PRODUCT_BUILD_SUPER_PARTITION := false PRODUCT_BROKEN_VERIFY_USES_LIBRARIES := true PRODUCT_MANUFACTURER := Google -PRODUCT_BRAND := google +PRODUCT_BRAND := Android PRODUCT_NAME := aosp_sunfish PRODUCT_DEVICE := sunfish -PRODUCT_MODEL := Pixel 4a - -PRODUCT_BUILD_PROP_OVERRIDES += \ - TARGET_PRODUCT=sunfish \ - PRIVATE_BUILD_DESC="sunfish-user 13 TQ3A.230805.001 10316531 release-keys" - -BUILD_FINGERPRINT := google/sunfish/sunfish:13/TQ3A.230805.001/10316531:user/release-keys - -$(call inherit-product, vendor/google/sunfish/sunfish-vendor.mk) +PRODUCT_MODEL := AOSP on sunfish diff --git a/nitrogen_sunfish.mk b/nitrogen_sunfish.mk new file mode 100644 index 000000000..0cface0b2 --- /dev/null +++ b/nitrogen_sunfish.mk @@ -0,0 +1,29 @@ +# +# Copyright (C) 2020-2021 The LineageOS Project +# +# SPDX-License-Identifier: Apache-2.0 +# + +# Inherit some common Lineage stuff. +TARGET_DISABLE_EPPE := true +$(call inherit-product, vendor/nitrogen/config/common_full_phone.mk) + +# Inherit device configuration +$(call inherit-product, device/google/sunfish/aosp_sunfish.mk) + +# Device identifier. This must come after all inclusions +PRODUCT_BRAND := google +PRODUCT_MODEL := Pixel 4a +PRODUCT_NAME := nitrogen_sunfish + +# Boot animation +TARGET_SCREEN_HEIGHT := 2340 +TARGET_SCREEN_WIDTH := 1080 + +PRODUCT_BUILD_PROP_OVERRIDES += \ + TARGET_PRODUCT=sunfish \ + PRIVATE_BUILD_DESC="sunfish-user 13 TQ3A.230805.001 10316531 release-keys" + +BUILD_FINGERPRINT := google/sunfish/sunfish:13/TQ3A.230805.001/10316531:user/release-keys + +$(call inherit-product, vendor/google/sunfish/sunfish-vendor.mk) From 831fb7656a3b7d924aecc54ccb4fd90a1be9c31a Mon Sep 17 00:00:00 2001 From: PixelBoot Date: Sat, 7 Oct 2023 22:34:28 +0200 Subject: [PATCH 34/56] sunfish: permissive selinux --- BoardConfig-common.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index 3e08142e3..24326b2c0 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -51,7 +51,7 @@ TARGET_NEEDS_DTBOIMAGE := true # Verified Boot BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS += --flags 3 -BOARD_KERNEL_CMDLINE += console=ttyMSM0,115200n8 androidboot.console=ttyMSM0 printk.devkmsg=on +BOARD_KERNEL_CMDLINE += androidboot.selinux=permissive console=ttyMSM0,115200n8 androidboot.console=ttyMSM0 printk.devkmsg=on BOARD_KERNEL_CMDLINE += msm_rtb.filter=0x237 BOARD_KERNEL_CMDLINE += ehci-hcd.park=3 BOARD_KERNEL_CMDLINE += service_locator.enable=1 From cb32ffe24d0cde820c18120f785d9bbfda172d43 Mon Sep 17 00:00:00 2001 From: PixelBoot Date: Thu, 5 Oct 2023 19:57:40 +0200 Subject: [PATCH 35/56] sunfish: disable data encryption Change-Id: I5b8866fe025ee10f12933d1939eed6acda6f8e03 --- fstab.hardware | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fstab.hardware b/fstab.hardware index 25c05e747..2fe1e848f 100644 --- a/fstab.hardware +++ b/fstab.hardware @@ -8,6 +8,6 @@ product /product e /dev/block/by-name/metadata /metadata ext4 noatime,nosuid,nodev,discard,data=journal,commit=1 wait,formattable,first_stage_mount,check,metadata_csum /dev/block/bootdevice/by-name/modem /vendor/firmware_mnt vfat ro,shortname=lower,uid=0,gid=1000,dmask=227,fmask=337,context=u:object_r:firmware_file:s0 wait,slotselect /dev/block/bootdevice/by-name/misc /misc emmc defaults defaults -/dev/block/bootdevice/by-name/userdata /data f2fs noatime,nosuid,nodev,discard,reserve_root=32768,resgid=1065,fsync_mode=nobarrier latemount,wait,check,quota,formattable,fileencryption=ice,reservedsize=128M,sysfs_path=/dev/sys/block/bootdevice,keydirectory=/metadata/vold/metadata_encryption,checkpoint=fs +/dev/block/bootdevice/by-name/userdata /data f2fs noatime,nosuid,nodev,discard,reserve_root=32768,resgid=1065,fsync_mode=nobarrier latemount,wait,check,quota,formattable,reservedsize=128M,sysfs_path=/dev/sys/block/bootdevice,keydirectory=/metadata/vold/metadata_encryption,checkpoint=fs /devices/platform/soc/a600000.ssusb/a600000.dwc3* auto vfat defaults voldmanaged=usb:auto /dev/block/zram0 none swap defaults zramsize=2147483648,max_comp_streams=8,zram_backingdev_size=512M From ec3fb068a646bb9846cc8480963768ab36418c08 Mon Sep 17 00:00:00 2001 From: PixelBoot Date: Thu, 5 Oct 2023 20:28:07 +0200 Subject: [PATCH 36/56] sunfish: Don't enforce priv-app permissions Change-Id: Ia3bdea511c13a644db29d9f9a3acee303400644f --- device.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/device.mk b/device.mk index 4af3d41ff..735f0c665 100644 --- a/device.mk +++ b/device.mk @@ -91,10 +91,6 @@ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml \ frameworks/native/data/etc/android.software.verified_boot.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.verified_boot.xml -# Enforce privapp-permissions whitelist -PRODUCT_PROPERTY_OVERRIDES += \ - ro.control_privapp_permissions?=enforce - PRODUCT_PACKAGES += \ messaging From d9468c20de4847b77d1e40957ea5dda7364c3c3f Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Wed, 14 Oct 2020 19:16:12 -0400 Subject: [PATCH 37/56] disable system_other odex --- device.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/device.mk b/device.mk index 735f0c665..c76ea66fc 100644 --- a/device.mk +++ b/device.mk @@ -158,7 +158,6 @@ endif # A/B support PRODUCT_PACKAGES += \ otapreopt_script \ - cppreopts.sh \ update_engine \ update_verifier @@ -175,9 +174,6 @@ PRODUCT_PACKAGES += \ bootctrl.sm6150 \ bootctrl.sm6150.recovery -PRODUCT_PROPERTY_OVERRIDES += \ - ro.cp_system_other_odex=1 - AB_OTA_POSTINSTALL_CONFIG += \ RUN_POSTINSTALL_system=true \ POSTINSTALL_PATH_system=system/bin/otapreopt_script \ From 880662e5d9fdeeca94a9e5ded2a288a472ef7385 Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Sat, 7 Oct 2023 22:36:26 +0200 Subject: [PATCH 38/56] SystemUIGoogle -> SystemUI --- device.mk | 2 +- overlay/frameworks/base/core/res/res/values/config.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/device.mk b/device.mk index c76ea66fc..afcaf7008 100644 --- a/device.mk +++ b/device.mk @@ -940,7 +940,7 @@ PRODUCT_PROPERTY_OVERRIDES += \ # Preopt SystemUI PRODUCT_DEXPREOPT_SPEED_APPS += \ - SystemUIGoogle + SystemUI # Compile SystemUI on device with `speed`. PRODUCT_PROPERTY_OVERRIDES += \ diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml index 670b6c6c9..d4062a265 100755 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ b/overlay/frameworks/base/core/res/res/values/config.xml @@ -288,7 +288,7 @@ "/apex/com.android.art/javalib/core-oj.jar" "/apex/com.android.art/javalib/core-libart.jar" "/system/bin/surfaceflinger" - "/system_ext/priv-app/SystemUIGoogle/SystemUIGoogle.apk" + "/system_ext/priv-app/SystemUI/SystemUI.apk" From 98b7b4b31b0644e340fdc7528de73b12da5fe9c6 Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Sat, 7 Oct 2023 22:37:08 +0200 Subject: [PATCH 39/56] disable GSI keys --- device.mk | 3 --- 1 file changed, 3 deletions(-) diff --git a/device.mk b/device.mk index afcaf7008..bcaa34ff3 100644 --- a/device.mk +++ b/device.mk @@ -98,9 +98,6 @@ TARGET_PRODUCT_PROP := $(LOCAL_PATH)/product.prop $(call inherit-product, $(LOCAL_PATH)/utils.mk) -# Installs gsi keys into ramdisk, to boot a developer GSI with verified boot. -$(call inherit-product, $(SRC_TARGET_DIR)/product/developer_gsi_keys.mk) - PRODUCT_CHARACTERISTICS := nosdcard PRODUCT_SHIPPING_API_LEVEL := 29 From b2774c5620bdd522cf107b0e58e5941530323dbd Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Sat, 14 Nov 2020 03:12:21 -0500 Subject: [PATCH 40/56] use device-specific NFC configuration --- aosp_sunfish.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/aosp_sunfish.mk b/aosp_sunfish.mk index 573dc6b87..7d4951fcb 100644 --- a/aosp_sunfish.mk +++ b/aosp_sunfish.mk @@ -14,6 +14,10 @@ # limitations under the License. # +# avoid using generic aosp_product.mk libnfc-nci.conf +PRODUCT_COPY_FILES += \ + $(LOCAL_PATH)/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf + # # All components inherited here go to system image # From 794d0b9ed280e72042b1c966e75f3fb5779e391d Mon Sep 17 00:00:00 2001 From: anupritaisno1 Date: Sat, 7 Oct 2023 22:39:33 +0200 Subject: [PATCH 41/56] sunfish: disable chained vbmeta --- BoardConfig-common.mk | 8 -------- fstab.hardware | 6 +++--- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index 24326b2c0..b7c1982b4 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -91,7 +91,6 @@ AB_OTA_PARTITIONS += \ dtbo \ product \ system_ext \ - vbmeta_system \ vendor BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4 @@ -104,13 +103,6 @@ TARGET_RECOVERY_UI_LIB := \ librecovery_ui_pixel \ libfstab -# Enable chain partition for system. -BOARD_AVB_VBMETA_SYSTEM := system system_ext product -BOARD_AVB_VBMETA_SYSTEM_KEY_PATH := external/avb/test/data/testkey_rsa2048.pem -BOARD_AVB_VBMETA_SYSTEM_ALGORITHM := SHA256_RSA2048 -BOARD_AVB_VBMETA_SYSTEM_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP) -BOARD_AVB_VBMETA_SYSTEM_ROLLBACK_INDEX_LOCATION := 1 - # product.img BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE := ext4 diff --git a/fstab.hardware b/fstab.hardware index 2fe1e848f..4c7b1e76a 100644 --- a/fstab.hardware +++ b/fstab.hardware @@ -1,9 +1,9 @@ # Android fstab file. # -system /system ext4 ro,barrier=1 wait,slotselect,avb=vbmeta_system,logical,first_stage_mount -system_ext /system_ext ext4 ro,barrier=1 wait,slotselect,avb=vbmeta_system,logical,first_stage_mount -vendor /vendor ext4 ro,barrier=1 wait,slotselect,avb=vbmeta,logical,first_stage_mount +system /system ext4 ro,barrier=1 wait,slotselect,avb=vbmeta,logical,first_stage_mount +system_ext /system_ext ext4 ro,barrier=1 wait,slotselect,avb,logical,first_stage_mount +vendor /vendor ext4 ro,barrier=1 wait,slotselect,avb,logical,first_stage_mount product /product ext4 ro,barrier=1 wait,slotselect,avb,logical,first_stage_mount /dev/block/by-name/metadata /metadata ext4 noatime,nosuid,nodev,discard,data=journal,commit=1 wait,formattable,first_stage_mount,check,metadata_csum /dev/block/bootdevice/by-name/modem /vendor/firmware_mnt vfat ro,shortname=lower,uid=0,gid=1000,dmask=227,fmask=337,context=u:object_r:firmware_file:s0 wait,slotselect From 2c7e17e16e66a9f3d70bf20b699a1f495a962cfe Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Sun, 14 Feb 2021 04:50:57 -0500 Subject: [PATCH 42/56] set boot security patch level --- device-common.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/device-common.mk b/device-common.mk index 4ac278213..88853d613 100644 --- a/device-common.mk +++ b/device-common.mk @@ -22,6 +22,8 @@ include device/google/sunfish/device.mk # Set Vendor SPL to match platform VENDOR_SECURITY_PATCH = $(PLATFORM_SECURITY_PATCH) +BOOT_SECURITY_PATCH = $(PLATFORM_SECURITY_PATCH) + PRODUCT_PROPERTY_OVERRIDES += vendor.audio.adm.buffering.ms=2 PRODUCT_PROPERTY_OVERRIDES += vendor.audio_hal.period_multiplier=2 PRODUCT_PROPERTY_OVERRIDES += af.fast_track_multiplier=1 From ec734be66eb7cb6d3cc2ae93281163b22d44c0f7 Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Sun, 14 Feb 2021 04:50:57 -0500 Subject: [PATCH 43/56] Enable Incremental support with inline kernel modules Change-Id: I5025e6833391cd597dc782bce78555326cec666b --- device-common.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-common.mk b/device-common.mk index 88853d613..0d3adbef4 100644 --- a/device-common.mk +++ b/device-common.mk @@ -126,7 +126,7 @@ endif # Enable Incremental on the device via kernel module PRODUCT_PROPERTY_OVERRIDES += \ - ro.incremental.enable=module:/vendor/lib/modules/incrementalfs.ko + ro.incremental.enable=yes # Enable watchdog timeout loop breaker. PRODUCT_PROPERTY_OVERRIDES += \ From 3e8bc48abfc0627bca0dd23e73ca0953a151d520 Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Sat, 7 Oct 2023 22:41:26 +0200 Subject: [PATCH 44/56] disable kernel module stripping --- BoardConfig-common.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index b7c1982b4..283ebbb96 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -222,6 +222,11 @@ DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/sunfish/device_framewo # Use mke2fs to create ext4 images TARGET_USES_MKE2FS := true +BOARD_DO_NOT_STRIP_RECOVERY_MODULES := true +BOARD_DO_NOT_STRIP_VENDOR_MODULES := true +BOARD_DO_NOT_STRIP_VENDOR_RAMDISK_MODULES := true +BOARD_DO_NOT_STRIP_VENDOR_KERNEL_RAMDISK_MODULES := true + # dynamic partition BOARD_SUPER_PARTITION_SIZE := 9755951104 BOARD_SUPER_PARTITION_GROUPS := google_dynamic_partitions From 008bc362ec7ed52467e8cbd49b235971cfdfc565 Mon Sep 17 00:00:00 2001 From: PixelBoot Date: Sat, 7 Oct 2023 22:48:01 +0200 Subject: [PATCH 45/56] inherit nitrogen config --- nitrogen_sunfish.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nitrogen_sunfish.mk b/nitrogen_sunfish.mk index 0cface0b2..825a49bfd 100644 --- a/nitrogen_sunfish.mk +++ b/nitrogen_sunfish.mk @@ -6,7 +6,7 @@ # Inherit some common Lineage stuff. TARGET_DISABLE_EPPE := true -$(call inherit-product, vendor/nitrogen/config/common_full_phone.mk) +$(call inherit-product, vendor/nitrogen/products/common.mk) # Inherit device configuration $(call inherit-product, device/google/sunfish/aosp_sunfish.mk) From 934670e77cf2f4ec3035b6c5d10b93b32deb82bc Mon Sep 17 00:00:00 2001 From: PixelBoot Date: Sun, 8 Oct 2023 10:37:27 +0200 Subject: [PATCH 46/56] evolution --- AndroidProducts.mk | 4 ++-- nitrogen_sunfish.mk => evolution_sunfish.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename nitrogen_sunfish.mk => evolution_sunfish.mk (87%) diff --git a/AndroidProducts.mk b/AndroidProducts.mk index d24462793..1d360dd0a 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -17,8 +17,8 @@ PRODUCT_MAKEFILES := \ $(LOCAL_DIR)/aosp_sunfish.mk \ $(LOCAL_DIR)/aosp_sunfish_hwasan.mk \ - $(LOCAL_DIR)/nitrogen_sunfish.mk \ + $(LOCAL_DIR)/evolution_sunfish.mk COMMON_LUNCH_CHOICES := \ aosp_sunfish-userdebug \ - nitrogen_sunfish-userdebug + evolution_sunfish-userdebug diff --git a/nitrogen_sunfish.mk b/evolution_sunfish.mk similarity index 87% rename from nitrogen_sunfish.mk rename to evolution_sunfish.mk index 825a49bfd..22a487ce0 100644 --- a/nitrogen_sunfish.mk +++ b/evolution_sunfish.mk @@ -6,7 +6,7 @@ # Inherit some common Lineage stuff. TARGET_DISABLE_EPPE := true -$(call inherit-product, vendor/nitrogen/products/common.mk) +$(call inherit-product, vendor/evolution/config/common_full_phone.mk) # Inherit device configuration $(call inherit-product, device/google/sunfish/aosp_sunfish.mk) @@ -14,7 +14,7 @@ $(call inherit-product, device/google/sunfish/aosp_sunfish.mk) # Device identifier. This must come after all inclusions PRODUCT_BRAND := google PRODUCT_MODEL := Pixel 4a -PRODUCT_NAME := nitrogen_sunfish +PRODUCT_NAME := evolution_sunfish # Boot animation TARGET_SCREEN_HEIGHT := 2340 From c7794d3aa1de0bbc0623fe5d52340f82f09435de Mon Sep 17 00:00:00 2001 From: "Josh Fox (XlxFoXxlX)" Date: Sun, 8 Oct 2023 12:08:32 +0200 Subject: [PATCH 47/56] sunfish: Disable mainline checking --- aosp_sunfish.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aosp_sunfish.mk b/aosp_sunfish.mk index 7d4951fcb..c062ede88 100644 --- a/aosp_sunfish.mk +++ b/aosp_sunfish.mk @@ -25,7 +25,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/generic_system.mk) # Enable mainline checking -PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := strict +#PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := strict # # All components inherited here go to system_ext image From 914b4784bd8efcae9e65764abea7f9e5167ab104 Mon Sep 17 00:00:00 2001 From: Steven Moreland Date: Mon, 9 Oct 2023 22:03:29 +0200 Subject: [PATCH 48/56] sunfish: sepolicy: remove vendor_service Now that all users are cleaned up, this is unused. Bug: 237115222 Test: build Change-Id: I22a303194bb760a40dac0e306895c348c5ce7b7a --- sepolicy/vendor/google/service.te | 2 +- sepolicy/vendor/qcom/common/service.te | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sepolicy/vendor/google/service.te b/sepolicy/vendor/google/service.te index 9c935e9c9..0c4726f3c 100644 --- a/sepolicy/vendor/google/service.te +++ b/sepolicy/vendor/google/service.te @@ -1 +1 @@ -type hal_pixel_display_service, service_manager_type, vendor_service; +type hal_pixel_display_service, service_manager_type, hal_service_type; diff --git a/sepolicy/vendor/qcom/common/service.te b/sepolicy/vendor/qcom/common/service.te index cb009419c..18541071c 100644 --- a/sepolicy/vendor/qcom/common/service.te +++ b/sepolicy/vendor/qcom/common/service.te @@ -4,4 +4,4 @@ type imsrcs_service, service_manager_type; type improve_touch_service, service_manager_type; type gba_auth_service, service_manager_type; type qtitetherservice_service, service_manager_type; -type hal_telephony_service, service_manager_type, vendor_service, protected_service; +type hal_telephony_service, service_manager_type, hal_service_type, protected_service; From f2f58c18ce8295a800eceb8fe411048e05c9a015 Mon Sep 17 00:00:00 2001 From: PixelBoot Date: Mon, 9 Oct 2023 22:04:59 +0200 Subject: [PATCH 49/56] sunfish: manifest: remove duplicate instances --- BoardConfig-common.mk | 2 +- manifest.xml | 39 --------------------------------------- 2 files changed, 1 insertion(+), 40 deletions(-) diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index 283ebbb96..096a5c8a7 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -213,7 +213,7 @@ TARGET_GRALLOC_HANDLE_HAS_RESERVED_SIZE := true # Vendor Interface Manifest DEVICE_MANIFEST_FILE := device/google/sunfish/manifest.xml DEVICE_MATRIX_FILE := device/google/sunfish/compatibility_matrix.xml -DEVICE_MANIFEST_FILE += hardware/st/nfc/aidl/nfc-service-default.xml +#DEVICE_MANIFEST_FILE += hardware/st/nfc/aidl/nfc-service-default.xml # Install product specific framework compatibility matrix # (TODO: b/169535506) This includes the FCM for system_ext and product partition. # It must be split into the FCM of each partition. diff --git a/manifest.xml b/manifest.xml index 688079b28..14eb55001 100644 --- a/manifest.xml +++ b/manifest.xml @@ -211,14 +211,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. default - - vendor.google.google_battery - 2 - - IGoogleBattery - default - - vendor.google.radioext hwbinder @@ -265,13 +257,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. default - - android.hardware.gnss - hwbinder - @1.1::IGnss/default - @2.0::IGnss/default - @2.1::IGnss/default - vendor.qti.hardware.radio.qcrilhook @@ -441,21 +426,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. default - - - android.hardware.neuralnetworks - hwbinder - @1.3::IDevice/qti-default - @1.3::IDevice/qti-dsp - @1.3::IDevice/qti-gpu - - - - android.hardware.keymaster - hwbinder - @4.0::IKeymasterDevice/default - @4.1::IKeymasterDevice/strongbox - android.hardware.power.stats hwbinder @@ -484,15 +454,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. default - - android.hardware.weaver - hwbinder - 1.0 - - IWeaver - default - - android.hardware.dumpstate hwbinder From 9c9df6e0675e11137353d86209f25306229f60b1 Mon Sep 17 00:00:00 2001 From: PixelBoot Date: Mon, 9 Oct 2023 22:29:34 +0200 Subject: [PATCH 50/56] sunfish: sepolicy: remove duplicate --- sepolicy/vendor/qcom/common/device.te | 1 - 1 file changed, 1 deletion(-) diff --git a/sepolicy/vendor/qcom/common/device.te b/sepolicy/vendor/qcom/common/device.te index 211d3d43e..a85f073a4 100644 --- a/sepolicy/vendor/qcom/common/device.te +++ b/sepolicy/vendor/qcom/common/device.te @@ -48,7 +48,6 @@ type system_health_monitor_device, dev_type; type qbt1000_device, dev_type; type avtimer_device, dev_type; type at_device, dev_type; -type bt_device, dev_type; type wlan_device, dev_type; type rawdump_block_device, dev_type; type custom_ab_block_device, dev_type; From d7c7fe49d781a85f8f95c60f85f2379c1355fa4c Mon Sep 17 00:00:00 2001 From: PixelBoot Date: Tue, 10 Oct 2023 20:34:42 +0200 Subject: [PATCH 51/56] Revert "sunfish: disable chained vbmeta" This reverts commit 794d0b9ed280e72042b1c966e75f3fb5779e391d. --- BoardConfig-common.mk | 8 ++++++++ fstab.hardware | 6 +++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index 096a5c8a7..7dff61b47 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -91,6 +91,7 @@ AB_OTA_PARTITIONS += \ dtbo \ product \ system_ext \ + vbmeta_system \ vendor BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4 @@ -103,6 +104,13 @@ TARGET_RECOVERY_UI_LIB := \ librecovery_ui_pixel \ libfstab +# Enable chain partition for system. +BOARD_AVB_VBMETA_SYSTEM := system system_ext product +BOARD_AVB_VBMETA_SYSTEM_KEY_PATH := external/avb/test/data/testkey_rsa2048.pem +BOARD_AVB_VBMETA_SYSTEM_ALGORITHM := SHA256_RSA2048 +BOARD_AVB_VBMETA_SYSTEM_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP) +BOARD_AVB_VBMETA_SYSTEM_ROLLBACK_INDEX_LOCATION := 1 + # product.img BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE := ext4 diff --git a/fstab.hardware b/fstab.hardware index 4c7b1e76a..2fe1e848f 100644 --- a/fstab.hardware +++ b/fstab.hardware @@ -1,9 +1,9 @@ # Android fstab file. # -system /system ext4 ro,barrier=1 wait,slotselect,avb=vbmeta,logical,first_stage_mount -system_ext /system_ext ext4 ro,barrier=1 wait,slotselect,avb,logical,first_stage_mount -vendor /vendor ext4 ro,barrier=1 wait,slotselect,avb,logical,first_stage_mount +system /system ext4 ro,barrier=1 wait,slotselect,avb=vbmeta_system,logical,first_stage_mount +system_ext /system_ext ext4 ro,barrier=1 wait,slotselect,avb=vbmeta_system,logical,first_stage_mount +vendor /vendor ext4 ro,barrier=1 wait,slotselect,avb=vbmeta,logical,first_stage_mount product /product ext4 ro,barrier=1 wait,slotselect,avb,logical,first_stage_mount /dev/block/by-name/metadata /metadata ext4 noatime,nosuid,nodev,discard,data=journal,commit=1 wait,formattable,first_stage_mount,check,metadata_csum /dev/block/bootdevice/by-name/modem /vendor/firmware_mnt vfat ro,shortname=lower,uid=0,gid=1000,dmask=227,fmask=337,context=u:object_r:firmware_file:s0 wait,slotselect From 90abb74886097ff2f9e8ff7af8f71b22c760f5fa Mon Sep 17 00:00:00 2001 From: PixelBoot Date: Tue, 10 Oct 2023 21:40:06 +0200 Subject: [PATCH 52/56] [TMP] sunfish: persistent logging --- device.mk | 1 + persistentLogging.rc | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 persistentLogging.rc diff --git a/device.mk b/device.mk index bcaa34ff3..e20609bef 100644 --- a/device.mk +++ b/device.mk @@ -121,6 +121,7 @@ PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/init.hardware.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.$(PRODUCT_PLATFORM).usb.rc \ $(LOCAL_PATH)/init.insmod.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.insmod.sh \ $(LOCAL_PATH)/init.sensors.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.sensors.sh \ + $(LOCAL_PATH)/persistentLogging.rc:$(TARGET_COPY_OUT_SYSTEM)/etc/init/persistentLogging.rc \ $(LOCAL_PATH)/thermal-engine-$(PRODUCT_HARDWARE).conf:$(TARGET_COPY_OUT_VENDOR)/etc/thermal-engine-$(PRODUCT_HARDWARE).conf \ $(LOCAL_PATH)/ueventd.rc:$(TARGET_COPY_OUT_VENDOR)/ueventd.rc \ $(LOCAL_PATH)/init.ramoops.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.ramoops.sh \ diff --git a/persistentLogging.rc b/persistentLogging.rc new file mode 100644 index 000000000..459826e57 --- /dev/null +++ b/persistentLogging.rc @@ -0,0 +1,20 @@ +on init + mkdir /metadata/logs 0775 system system + rm /metadata/logs/logcat.log + rm /metadata/logs/dmesg.log + start persistentLogging + start persistentDmesg + +on property:sys.boot_completed=1 + stop persistentLogging + stop persistentDmesg + +service persistentLogging /system/bin/logcat -f /metadata/logs/logcat.log + user root + group root system log + disabled + +service persistentDmesg "/system/bin/dmesg -w > /metadata/logs/dmesg.log" + user root + group root system log + disabled From cf8a10558a96363cdf538453233dfa9441d47887 Mon Sep 17 00:00:00 2001 From: PixelBoot Date: Tue, 10 Oct 2023 22:16:38 +0200 Subject: [PATCH 53/56] sunfish: build libprotobuf-cpp-lite-3.9.1-vendorcompat 11-17 08:46:10.957 1794 1794 F linker : CANNOT LINK EXECUTABLE "/vendor/bin/hw/android.hardware.keymaster@4.1-service.citadel": library "libprotobuf-cpp-full-3.9.1.so" not found: needed by main executable --- device.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/device.mk b/device.mk index e20609bef..5fd4c0d04 100644 --- a/device.mk +++ b/device.mk @@ -463,7 +463,8 @@ PRODUCT_PACKAGES += \ # Protobuf PRODUCT_PACKAGES += \ - libprotobuf-cpp-full-vendorcompat + libprotobuf-cpp-full-vendorcompat \ + libprotobuf-cpp-full-3.9.1-vendorcompat # Sensor listener PRODUCT_PACKAGES += \ From fd172dd7134763ee938ef732be8997cf9221c19c Mon Sep 17 00:00:00 2001 From: PixelBoot Date: Fri, 13 Oct 2023 23:25:33 +0200 Subject: [PATCH 54/56] sunfish: add libprotbuf-cpp-full-3.9.1 shim --- extract-files.sh | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/extract-files.sh b/extract-files.sh index eb66c0e87..1b13e287d 100755 --- a/extract-files.sh +++ b/extract-files.sh @@ -11,6 +11,19 @@ set -e DEVICE=sunfish VENDOR=google +function blob_fixup() { + case "${1}" in + vendor/lib64/android.hardware.keymaster@4.1-impl.nos.so) + # Replace libprotobuf-cpp-full-3.9.1.so with stock libprotobuf-cpp-full-3.9.1.so + "${PATCHELF}" --replace-needed libprotobuf-cpp-full-3.9.1.so libprotobuf-cpp-stock-3.9.1.so "${2}" + ;; + vendor/lib64/libnosprotos.so) + # Replace libprotobuf-cpp-full-3.9.1.so with stock libprotobuf-cpp-full-3.9.1.so + "${PATCHELF}" --replace-needed libprotobuf-cpp-full-3.9.1.so libprotobuf-cpp-stock-3.9.1.so "${2}" + ;; + esac +} + # Load extract_utils and do some sanity checks MY_DIR="${BASH_SOURCE%/*}" if [[ ! -d "${MY_DIR}" ]]; then MY_DIR="${PWD}"; fi From bd24515d40733227b68951af5f4168947fe3d3b8 Mon Sep 17 00:00:00 2001 From: PixelBoot Date: Sat, 14 Oct 2023 14:28:40 +0200 Subject: [PATCH 55/56] sunfish: Add shim for missing synbol in libnosprotos.so 11-21 00:47:41.577 627 627 F linker : CANNOT LINK EXECUTABLE "/vendor/bin/hw/android.hardware.keymaster@4.1-service.citadel": cannot locate symbol "_ZN6nugget3app9keymaster27SetSystemVersionInfoRequestC1Ev" referenced by "/vendor/lib64/android.hardware.keymaster@4.1-impl.nos.so"... --- device.mk | 4 ++++ libshims/Android.bp | 6 ++++++ libshims/libnosprotos/SetSystemVersionInfoRequest.cpp | 5 +++++ proprietary-files-vendor.txt | 2 ++ 4 files changed, 17 insertions(+) create mode 100644 libshims/Android.bp create mode 100644 libshims/libnosprotos/SetSystemVersionInfoRequest.cpp diff --git a/device.mk b/device.mk index 5fd4c0d04..db681f5ba 100644 --- a/device.mk +++ b/device.mk @@ -466,6 +466,10 @@ PRODUCT_PACKAGES += \ libprotobuf-cpp-full-vendorcompat \ libprotobuf-cpp-full-3.9.1-vendorcompat +# Shims +PRODUCT_PACKAGES += \ + libnosprotos_shim + # Sensor listener PRODUCT_PACKAGES += \ lib_sensor_listener diff --git a/libshims/Android.bp b/libshims/Android.bp new file mode 100644 index 000000000..1ebaa5b70 --- /dev/null +++ b/libshims/Android.bp @@ -0,0 +1,6 @@ +cc_library_shared { + name: "libnosprotos_shim", + srcs: ["libnosprotos/SetSystemVersionInfoRequest.cpp"], + shared_libs: ["libnosprotos"], + vendor: true, +} diff --git a/libshims/libnosprotos/SetSystemVersionInfoRequest.cpp b/libshims/libnosprotos/SetSystemVersionInfoRequest.cpp new file mode 100644 index 000000000..042bb8664 --- /dev/null +++ b/libshims/libnosprotos/SetSystemVersionInfoRequest.cpp @@ -0,0 +1,5 @@ +#include "nugget/app/keymaster/keymaster.pb.h" + +extern "C" void _ZN6nugget3app9keymaster27SetSystemVersionInfoRequestC1Ev(nugget::app::keymaster::SetSystemVersionInfoRequest* request) { + new (request) nugget::app::keymaster::SetSystemVersionInfoRequest; +} diff --git a/proprietary-files-vendor.txt b/proprietary-files-vendor.txt index 7f44834f1..fe0667624 100644 --- a/proprietary-files-vendor.txt +++ b/proprietary-files-vendor.txt @@ -1180,12 +1180,14 @@ vendor/lib64/libnetmgr_nr_fusion.so vendor/lib64/libnetmgr_rmnet_ext.so vendor/lib64/libnlnetmgr.so vendor/lib64/libnos_citadeld_proxy.so +vendor/lib64/libnosprotos.so vendor/lib64/liboemcrypto.so vendor/lib64/libops.so vendor/lib64/libpdmapper.so vendor/lib64/libpdnotifier.so vendor/lib64/libperipheral_client.so vendor/lib64/libpower_anomaly_data.so +vendor/lib64/libprotobuf-cpp-full-3.9.1.so vendor/lib64/libpvr.so vendor/lib64/libqcbor.so vendor/lib64/libqcc_file_agent.so From 70f624085c39dddf16b0e3661f00d21d4f48d08b Mon Sep 17 00:00:00 2001 From: PixelBoot Date: Sat, 14 Oct 2023 14:35:19 +0200 Subject: [PATCH 56/56] sunfish: don't build shims locally --- libshims/Android.bp | 6 ------ libshims/libnosprotos/SetSystemVersionInfoRequest.cpp | 5 ----- 2 files changed, 11 deletions(-) delete mode 100644 libshims/Android.bp delete mode 100644 libshims/libnosprotos/SetSystemVersionInfoRequest.cpp diff --git a/libshims/Android.bp b/libshims/Android.bp deleted file mode 100644 index 1ebaa5b70..000000000 --- a/libshims/Android.bp +++ /dev/null @@ -1,6 +0,0 @@ -cc_library_shared { - name: "libnosprotos_shim", - srcs: ["libnosprotos/SetSystemVersionInfoRequest.cpp"], - shared_libs: ["libnosprotos"], - vendor: true, -} diff --git a/libshims/libnosprotos/SetSystemVersionInfoRequest.cpp b/libshims/libnosprotos/SetSystemVersionInfoRequest.cpp deleted file mode 100644 index 042bb8664..000000000 --- a/libshims/libnosprotos/SetSystemVersionInfoRequest.cpp +++ /dev/null @@ -1,5 +0,0 @@ -#include "nugget/app/keymaster/keymaster.pb.h" - -extern "C" void _ZN6nugget3app9keymaster27SetSystemVersionInfoRequestC1Ev(nugget::app::keymaster::SetSystemVersionInfoRequest* request) { - new (request) nugget::app::keymaster::SetSystemVersionInfoRequest; -}