From 5e3ac86e93aed5c9b43553ce4dc2c5ad9bc29370 Mon Sep 17 00:00:00 2001 From: Alex Hong Date: Wed, 23 Feb 2022 18:35:39 +0800 Subject: [PATCH 1/8] "Erase Downloaded sims" Checkbox is not visible Enable the masterclear.allow_retain_esim_profiles_after_fdr for checkbox is visible This is picked from a8acce0 Bug: 220209981 Test: build pass Change-Id: I930c4038ceabcaa214fc5c8ad434ab3861b24acf --- device-common.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/device-common.mk b/device-common.mk index cc7818b1..33c16fc6 100644 --- a/device-common.mk +++ b/device-common.mk @@ -35,5 +35,10 @@ PRODUCT_VENDOR_PROPERTIES += ro.soc.model=GS201 PRODUCT_PRODUCT_PROPERTIES += \ persist.vendor.testing_battery_profile=0 +# The default value of this variable is false and should only be set to true when +# the device allows users to retain eSIM profiles after factory reset of user data. +PRODUCT_PRODUCT_PROPERTIES += \ + masterclear.allow_retain_esim_profiles_after_fdr=true + # ZramWriteback -include hardware/google/pixel/mm/device_gki.mk From 592769127dace2b90ab2caeb3347ca4a34cabace Mon Sep 17 00:00:00 2001 From: Alex Hong Date: Thu, 17 Feb 2022 14:23:21 +0800 Subject: [PATCH 2/8] Remove tetheroffload service Test: m checkvintf run vts -m VtsHalTetheroffloadControlV1_0TargetTest Bug: 207076973 Bug: 214494717 Change-Id: Idd33fbd5e9750e16fb4e2339953bd8d9007b88fb Merged-In: Idd33fbd5e9750e16fb4e2339953bd8d9007b88fb --- device.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/device.mk b/device.mk index adfaa122..9dbed533 100644 --- a/device.mk +++ b/device.mk @@ -1037,10 +1037,6 @@ PRODUCT_PACKAGES += \ update_engine_sideload \ update_verifier -# tetheroffload HAL -PRODUCT_PACKAGES += \ - vendor.samsung_slsi.hardware.tetheroffload@1.0-service - # pKVM $(call inherit-product, packages/modules/Virtualization/apex/product_packages.mk) PRODUCT_BUILD_PVMFW_IMAGE := true From 9984544ec89997ae28806395130dd4b0a9be8a2c Mon Sep 17 00:00:00 2001 From: Alex Hong Date: Thu, 25 Nov 2021 20:56:37 +0800 Subject: [PATCH 3/8] Upgrade PRODUCT_SHIPPING_API_LEVEL for gs201 devices Update the Target FCM level from 5 to 6 Update the product FCM xml Bug: 207076973 Test: m checkvintf Change-Id: Ifa9c7e103671e1072496f6f76dd0c3233fb46a6e Merged-In: Ifa9c7e103671e1072496f6f76dd0c3233fb46a6e --- device.mk | 4 ++-- device_framework_matrix_product.xml | 26 +++++++++++++++++++++++++- manifest-gralloc3.xml | 2 +- manifest.xml | 2 +- 4 files changed, 29 insertions(+), 5 deletions(-) diff --git a/device.mk b/device.mk index 9dbed533..373ab487 100644 --- a/device.mk +++ b/device.mk @@ -228,8 +228,8 @@ DEVICE_MATRIX_FILE := \ DEVICE_PACKAGE_OVERLAYS += device/google/gs201/overlay -# This will be updated to 31 (Android S) for shipping -PRODUCT_SHIPPING_API_LEVEL := 30 +# This will be updated to 33 (Android T) for shipping +PRODUCT_SHIPPING_API_LEVEL := 31 # Temporarily disable the debugfs restriction on 31 (Android S) PRODUCT_SET_DEBUGFS_RESTRICTIONS := false diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml index a8f77006..72d536f7 100644 --- a/device_framework_matrix_product.xml +++ b/device_framework_matrix_product.xml @@ -1,4 +1,20 @@ - + + + android.hardware.contexthub + 1 + + IContextHub + default + + + + android.hardware.graphics.composer3 + 1 + + IComposer + default + + android.hardware.radio 1.2 @@ -15,6 +31,14 @@ dual + + android.hardware.wifi.hostapd + 1 + + IHostapd + default + + android.vendor.samsung_slsi.telephony.hardware.radio 1.1 diff --git a/manifest-gralloc3.xml b/manifest-gralloc3.xml index 4ae12513..5ea7c7ea 100644 --- a/manifest-gralloc3.xml +++ b/manifest-gralloc3.xml @@ -1,4 +1,4 @@ - + android.hardware.audio hwbinder diff --git a/manifest.xml b/manifest.xml index 19bf68f9..b80598c0 100644 --- a/manifest.xml +++ b/manifest.xml @@ -1,4 +1,4 @@ - + android.hardware.audio hwbinder From 0c20f31dd7b24b0d1c089e906badd82b23e41ef3 Mon Sep 17 00:00:00 2001 From: Alex Hong Date: Tue, 22 Feb 2022 15:58:27 +0800 Subject: [PATCH 4/8] Upgrade PRODUCT_SHIPPING_API_LEVEL from 31 to 32 for gs201 devices Copy ueventd.rc to /vendor/etc instead of /vendor. /vendor is no longer a supported path for Product Shipping API 32 Test: m checkvintf Device boot-to-home Bug: 207076973 Change-Id: Iac11d342854e08739e6b83e5d8134097760ccfd2 --- device.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/device.mk b/device.mk index 373ab487..6807a9bf 100644 --- a/device.mk +++ b/device.mk @@ -229,7 +229,7 @@ DEVICE_MATRIX_FILE := \ DEVICE_PACKAGE_OVERLAYS += device/google/gs201/overlay # This will be updated to 33 (Android T) for shipping -PRODUCT_SHIPPING_API_LEVEL := 31 +PRODUCT_SHIPPING_API_LEVEL := 32 # Temporarily disable the debugfs restriction on 31 (Android S) PRODUCT_SET_DEBUGFS_RESTRICTIONS := false @@ -242,7 +242,7 @@ PRODUCT_ENFORCE_PRODUCT_PARTITION_INTERFACE := true PRODUCT_COPY_FILES += \ $(LOCAL_KERNEL):kernel \ device/google/gs201/conf/init.gs201.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.gs201.usb.rc \ - device/google/gs201/conf/ueventd.gs201.rc:$(TARGET_COPY_OUT_VENDOR)/ueventd.rc + device/google/gs201/conf/ueventd.gs201.rc:$(TARGET_COPY_OUT_VENDOR)/etc/ueventd.rc PRODUCT_COPY_FILES += \ device/google/gs201/conf/init.gs201.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.gs201.rc From 5353fe7961a088127096c6b2cc455cce8b0dcc44 Mon Sep 17 00:00:00 2001 From: Yi-Yo Chiang Date: Fri, 18 Feb 2022 23:11:48 +0800 Subject: [PATCH 5/8] Add alternative ext4 system mount line to facilitate compliance testing During compliance testing, the system partition image is replaced with GSI. However GSI is ext4, so we need an ext4 mount line for GSI to fallback to, since the first erofs line would fail to mount. Bug: 220074274 Test: Boot with GSI Change-Id: Id69fab591feb9cfd378de432c51f3058a3ab8b9c --- conf/fstab.gs201.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conf/fstab.gs201.in b/conf/fstab.gs201.in index 8d7ee918..a3cdfe0a 100644 --- a/conf/fstab.gs201.in +++ b/conf/fstab.gs201.in @@ -5,6 +5,8 @@ # # system /system erofs ro wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128 +# During compliance testing, the previous line would fail (because GSI is ext4), and the next line would be used to mount GSI. +system /system ext4 ro,barrier=1 wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128 system_ext /system_ext erofs ro wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128 product /product erofs ro wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128 vendor /vendor erofs ro wait,slotselect,avb=vbmeta_vendor,logical,first_stage_mount,readahead_size_kb=128 From a04c61d42b04f1db4f4c4b419fb94166f7e3c4f0 Mon Sep 17 00:00:00 2001 From: SalmaxChang Date: Thu, 24 Feb 2022 14:55:11 +0800 Subject: [PATCH 6/8] dumpstate: correct verbose logging property Bug: 221173724 Change-Id: I9d525c55bed2f05e7e89d2253f7bd4f67b7cd6f3 --- dumpstate/DumpstateDevice.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dumpstate/DumpstateDevice.cpp b/dumpstate/DumpstateDevice.cpp index 8f788f97..4c88615d 100644 --- a/dumpstate/DumpstateDevice.cpp +++ b/dumpstate/DumpstateDevice.cpp @@ -71,7 +71,7 @@ namespace implementation { typedef std::chrono::time_point timepoint_t; -const char kVerboseLoggingProperty[] = "persist.dumpstate.verbose_logging.enabled"; +const char kVerboseLoggingProperty[] = "persist.vendor.verbose_logging_enabled"; void DumpstateDevice::dumpLogs(int fd, std::string srcDir, std::string destDir, int maxFileNum, const char *logPrefix) { From e9893b4e61d77cc474587a46ddf96ab31effbefa Mon Sep 17 00:00:00 2001 From: Sam Dubey Date: Thu, 24 Feb 2022 06:37:05 +0000 Subject: [PATCH 7/8] Make hostapd optional This is to mitigate build breakage. Fix: 221164554 Bug: 207076973 Change-Id: Iaa6a79ea7a313356806c77575302c7b10e22e3fa --- device_framework_matrix_product.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml index 72d536f7..2ac454af 100644 --- a/device_framework_matrix_product.xml +++ b/device_framework_matrix_product.xml @@ -31,7 +31,7 @@ dual - + android.hardware.wifi.hostapd 1 From 5443c7ec011c9dd573550c38cee90804fdaa80be Mon Sep 17 00:00:00 2001 From: Grace Chen Date: Tue, 8 Feb 2022 00:13:35 -0800 Subject: [PATCH 8/8] Enable DSDS by default Bug: 197273281 Test: Confirm DSDS property. Change-Id: I007ef6b81ddfdb3d9692f286bbcb85c2bae5dae5 --- device.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/device.mk b/device.mk index 6807a9bf..21f867cb 100644 --- a/device.mk +++ b/device.mk @@ -114,6 +114,10 @@ PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PRODUCT_PROPERTIES += \ persist.radio.reboot_on_modem_change=false +# Configure DSDS by default +PRODUCT_PRODUCT_PROPERTIES += \ + persist.radio.multisim.config=dsds + # Enable Early Camping PRODUCT_PRODUCT_PROPERTIES += \ persist.vendor.ril.camp_on_earlier=1