From 7b45c49c65022f9667ca388e2ec9e83c2b2c48c2 Mon Sep 17 00:00:00 2001 From: Nelson Li Date: Mon, 29 Apr 2024 02:57:55 +0000 Subject: [PATCH 1/4] Refactor product inheritance for comet products Add an additional layer of inheritance for `aosp_comet`. This change adds a common layer of inheritance for non-factory products (comet_generic.mk). This makes it easier to configure factory and non-factory products differently. Non-factory `comet` products now inherits from `device/google/comet/comet_generic.mk` which inherit from `device/google/comet/device-comet.mk`. aconfig flags: Flag: EXEMPT mechanical refactoring build flags: Flag: EXEMPT mechanical refactoring Bug: 336452008 Bug: 336707612 Test: lunch aosp_comet-trunk_staging-userdebug && m Change-Id: I22306fbe0eadc217d61a19ebd163265f9d0f12a0 --- aosp_comet.mk | 2 +- comet_generic.mk | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 comet_generic.mk diff --git a/aosp_comet.mk b/aosp_comet.mk index 8314211..c874834 100644 --- a/aosp_comet.mk +++ b/aosp_comet.mk @@ -17,7 +17,7 @@ TARGET_LINUX_KERNEL_VERSION := 6.1 $(call inherit-product, device/google/zumapro/aosp_common.mk) -$(call inherit-product, device/google/comet/device-comet.mk) +$(call inherit-product, device/google/comet/comet_generic.mk) PRODUCT_NAME := aosp_comet PRODUCT_DEVICE := comet diff --git a/comet_generic.mk b/comet_generic.mk new file mode 100644 index 0000000..0036010 --- /dev/null +++ b/comet_generic.mk @@ -0,0 +1,17 @@ +# +# Copyright 2024 The Android Open-Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +$(call inherit-product, device/google/comet/device-comet.mk) From 7e0d85ec533f433f49350105196ac140969d1a3d Mon Sep 17 00:00:00 2001 From: Ted Wang Date: Mon, 29 Apr 2024 08:44:08 +0000 Subject: [PATCH 2/4] Add system property for concurrent encryption on LE and BR/EDR Bug: 330704060 Change-Id: I31f8bcb49359473d52474231b6e777c62109ae51 Test: make --- device-comet.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/device-comet.mk b/device-comet.mk index d9ae732..402f16e 100644 --- a/device-comet.mk +++ b/device-comet.mk @@ -196,6 +196,10 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_PRODUCT_PROPERTIES += \ bluetooth.hfp.swb.supported=true +# Support LE & Classic concurrent encryption (b/330704060) +PRODUCT_PRODUCT_PROPERTIES += \ + bluetooth.ble.allow_enc_with_bredr=true + # POF PRODUCT_PRODUCT_PROPERTIES += \ ro.bluetooth.finder.supported=true From 35b9d94fd109f3a976a8ae6068ffbcab9d24eeb0 Mon Sep 17 00:00:00 2001 From: Cheng Chang Date: Tue, 30 Apr 2024 02:30:35 +0000 Subject: [PATCH 3/4] gps: Enable GAAM and disable magnetometer Bug: 337715905 Test: Verified sensor service without magnetometer. Change-Id: Ie1a1d758c3f8a4d2b06795680f798e6c9f4286ce --- location/user/gps.cfg | 4 ++-- location/userdebug/gps.cfg | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/location/user/gps.cfg b/location/user/gps.cfg index 77f008c..2fd3edd 100644 --- a/location/user/gps.cfg +++ b/location/user/gps.cfg @@ -7,7 +7,7 @@ GlueLayer_EnableGnssCfgInterface=1 gnss_device_type=K042 gnss_device_patch_address=0 gnss_device_patch_file=/vendor/firmware/kepler.bin -ism_stream_enable=0 +ism_stream_enable=1 caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK MaxNtnRefLocAgeSecs=600 GlueLayer_IsPlatformRefTimeEnable=1 @@ -49,7 +49,7 @@ GlueLayer_isReqDBHFromFwRefLoc=1 GlueLayer_isReqUBPFromPressureSensor=1 GlueLayer_IsMemsEnable=1 GlueLayer_MeasCorrCap=7 -Chip_Configuration_mems_data_Configuration=0x7 +Chip_Configuration_mems_data_Configuration=0x5 Chip_Configuration_FeatureCfg_ANDRD_MEAS_CORR_ENABLE=1 CP_LocTech_PrimaryConst=0 CP_LocTech_Constraints=0x81 diff --git a/location/userdebug/gps.cfg b/location/userdebug/gps.cfg index 4b69545..c39b9d9 100644 --- a/location/userdebug/gps.cfg +++ b/location/userdebug/gps.cfg @@ -21,7 +21,7 @@ gnss_device_patch_address=0 gnss_device_patch_file=/vendor/firmware/kepler.bin # enable ism stream for GAAM -ism_stream_enable=0 +ism_stream_enable=1 caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK MaxNtnRefLocAgeSecs=600 @@ -175,7 +175,7 @@ GlueLayer_isReqDBHFromFwRefLoc=1 GlueLayer_isReqUBPFromPressureSensor=1 GlueLayer_IsMemsEnable=1 GlueLayer_MeasCorrCap=7 -Chip_Configuration_mems_data_Configuration=0x7 +Chip_Configuration_mems_data_Configuration=0x5 Chip_Configuration_FeatureCfg_ANDRD_MEAS_CORR_ENABLE=1 CP_LocTech_PrimaryConst=0 CP_LocTech_Constraints=0x81 From 5e7e34f27ac2451d370e464a09974a57300f2d86 Mon Sep 17 00:00:00 2001 From: Matt Buckley Date: Mon, 29 Apr 2024 23:36:43 +0000 Subject: [PATCH 4/4] Add POWER_EFFICIENCY uclamp max to adpf config Add the "UclampMax_EfficientBase" value to the ADPF config in the powerhint.json to specify efficient core scheduling in the static case, and "UclampMax_EfficientOffset" for the dynamic case, for this device. Bug: 277285195 Test: manual Change-Id: I46a03a794fab1446fe3dd2f7b8a87c723157bd24 --- powerhint-comet.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/powerhint-comet.json b/powerhint-comet.json index c8d1d4d..f70868d 100644 --- a/powerhint-comet.json +++ b/powerhint-comet.json @@ -3120,6 +3120,8 @@ "UclampMin_LoadReset": 480, "UclampMin_High": 480, "UclampMin_Low": 2, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, @@ -3153,6 +3155,8 @@ "UclampMin_LoadReset": 480, "UclampMin_High": 480, "UclampMin_Low": 2, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, @@ -3186,6 +3190,8 @@ "UclampMin_LoadReset": 480, "UclampMin_High": 480, "UclampMin_Low": 2, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, @@ -3220,6 +3226,8 @@ "UclampMin_Init": 250, "UclampMin_High": 196, "UclampMin_Low": 196, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "ReportingRateLimitNs": 1, "TargetTimeFactor": 1.0, "StaleTimeFactor": 5.0 @@ -3242,6 +3250,8 @@ "UclampMin_Init": 250, "UclampMin_High": 52, "UclampMin_Low": 52, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "ReportingRateLimitNs": 1, "TargetTimeFactor": 1.0, "StaleTimeFactor": 5.0 @@ -3264,6 +3274,8 @@ "UclampMin_Init": 250, "UclampMin_High": 0, "UclampMin_Low": 0, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "ReportingRateLimitNs": 1, "TargetTimeFactor": 1.0, "StaleTimeFactor": 5.0