From 4260d818e23060df3c7b75e169bf01e17f00340d Mon Sep 17 00:00:00 2001 From: Jeffrey Carlyle Date: Fri, 17 Feb 2023 14:59:10 -0800 Subject: [PATCH 01/48] dck: add SE capability property Bug: 229777047 Test: boot cheetah; check logs to see that SE property is used Change-Id: I206404a007341dc028aa24e94633490ce96bac6b Signed-off-by: Jeffrey Carlyle --- device-felix.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/device-felix.mk b/device-felix.mk index 8378687..2274743 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -225,7 +225,8 @@ PRODUCT_PRODUCT_PROPERTIES += \ # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ - ro.gms.dck.eligible_wcc=3 + ro.gms.dck.eligible_wcc=3 \ + ro.gms.dck.se_capability=1 # Graphics PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.enable_frame_rate_override=true From 08152516c5540366cb80ba90b2ebdd13df6cff58 Mon Sep 17 00:00:00 2001 From: Joe Onorato Date: Fri, 14 Apr 2023 11:57:38 -0700 Subject: [PATCH 02/48] Speed up felix builds by excluding code that can never be used. Uses the new PRODUCT_SOURCE_ROOT_DIRS flag, and the file list for pixel in vendor/google/products/sources_pixel.mk Test: treehugger, abtd for the relevant buidls Change-Id: Ia82de77b8b90399b1d0527361212acbf649ff3e3 --- device-felix.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/device-felix.mk b/device-felix.mk index 68d76ef..f8c2d7c 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -14,6 +14,9 @@ # limitations under the License. # +# Restrict the visibility of Android.bp files to improve build analysis time +$(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk) + TARGET_KERNEL_DIR ?= device/google/felix-kernel TARGET_BOARD_KERNEL_HEADERS := device/google/felix-kernel/kernel-headers TARGET_RECOVERY_DEFAULT_ROTATION := ROTATION_RIGHT From 22bbfc3d3ee78b906c87e00be978f85ef7225b37 Mon Sep 17 00:00:00 2001 From: Samuel Gosselin Date: Wed, 7 Jun 2023 18:49:00 +0000 Subject: [PATCH 03/48] Fix the source paths of the bluetooth csv files The source files currently referenced with LOCAL_PATH, which is not always correctly set. Fix the paths by using the fullpath from the AOSP root instead. Tests: - CI for felix - Locally built lunch combo for felix on staging kernel. Bug: 277993984 Change-Id: I014ab23d480751d219e2c3fc4da457b6b4664866 Signed-off-by: Samuel Gosselin --- device-felix.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/device-felix.mk b/device-felix.mk index d5e6d17..c05ffc9 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -136,10 +136,10 @@ PRODUCT_PROPERTY_OVERRIDES += \ # Bluetooth Tx power caps PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_felix_US.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits.csv \ - $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_felix_JP.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_JP.csv \ - $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_felix_EU.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_EU.csv \ - $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_felix_US.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_US.csv + device/google/felix/bluetooth/bluetooth_power_limits_felix_US.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits.csv \ + device/google/felix/bluetooth/bluetooth_power_limits_felix_JP.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_JP.csv \ + device/google/felix/bluetooth/bluetooth_power_limits_felix_EU.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_EU.csv \ + device/google/felix/bluetooth/bluetooth_power_limits_felix_US.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_US.csv # Spatial Audio PRODUCT_PACKAGES += \ From b6fb6e7ef2c34dfe4c894899266476b424ccce9a Mon Sep 17 00:00:00 2001 From: matthuang Date: Wed, 28 Jun 2023 05:44:48 +0000 Subject: [PATCH 04/48] F10: load s2mpg12-regulator in sequence. Bug: 287238845 Test: sensor_test -ausf sample -s6 Change-Id: I743f58e75d333c7b21411109c27d5458bb4bfeac --- felix/BoardConfig.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/felix/BoardConfig.mk b/felix/BoardConfig.mk index 856eb42..3af8af8 100644 --- a/felix/BoardConfig.mk +++ b/felix/BoardConfig.mk @@ -26,6 +26,7 @@ BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true # The modules which need to be loaded in sequential BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1 BOARD_KERNEL_CMDLINE += panel-samsung-ana6707-f10.load_sequential=1 +BOARD_KERNEL_CMDLINE += s2mpg12-regulator.load_sequential=1 #Display USES_IDISPLAY_INTF_SEC := true From 828a1a62e056247606c9bd04a407ade82527bc17 Mon Sep 17 00:00:00 2001 From: TeYuan Wang Date: Thu, 20 Jul 2023 09:53:54 -0700 Subject: [PATCH 05/48] thermal: modify emergency and shutdown threshold for VIRTUAL-SKIN Bug: 289752109 Test: adb shell dumpsys android.hardware.thermal.IThermal/default | grep VIRTUAL-SKIN | grep hotThrottlingThreshold Change-Id: I1327be31f164a9e4263fb9c5381adc09378b19c5 (cherry picked from commit 3a0c866fa5e0a20c61c9102d33f70168b7973535) --- thermal_info_config_felix.json | 2 +- thermal_info_config_proactive_skin_felix.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/thermal_info_config_felix.json b/thermal_info_config_felix.json index 297b3f8..013d18e 100644 --- a/thermal_info_config_felix.json +++ b/thermal_info_config_felix.json @@ -228,7 +228,7 @@ "Combination":["OPEN-SUB-MAX", "CLOSE-SUB-MAX"], "Coefficient":["OPEN_WEIGHT", "CLOSE_WEIGHT"], "CoefficientType":["SENSOR", "SENSOR"], - "HotThreshold":["NAN", 39.0, 43.0, 45.0, 46.5, 51.0, 54.0], + "HotThreshold":["NAN", 39.0, 43.0, 45.0, 46.5, 53.0, 57.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "Multiplier":0.001, "PollingDelay":300000, diff --git a/thermal_info_config_proactive_skin_felix.json b/thermal_info_config_proactive_skin_felix.json index fd4d8d9..5c10f4b 100644 --- a/thermal_info_config_proactive_skin_felix.json +++ b/thermal_info_config_proactive_skin_felix.json @@ -228,7 +228,7 @@ "Combination":["OPEN-SUB-MAX", "CLOSE-SUB-MAX"], "Coefficient":["OPEN_WEIGHT", "CLOSE_WEIGHT"], "CoefficientType":["SENSOR", "SENSOR"], - "HotThreshold":["NAN", 37.0, 41.0, 45.0, 46.5, 51.0, 54.0], + "HotThreshold":["NAN", 37.0, 41.0, 45.0, 46.5, 53.0, 57.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "Multiplier":0.001, "PollingDelay":300000, From 74a0f2b801aec693668a8a16ff790124cf374772 Mon Sep 17 00:00:00 2001 From: Nathan Kulczak Date: Tue, 15 Aug 2023 17:32:24 +0000 Subject: [PATCH 06/48] felix/vibrator: Disable PWLE by default Set chirp.enabled prop to 0 by default so that it will not cause tests to fail. Change prop to persist from ro so that it can be enabled for testing. Update Felix HAL to use new prop. Bug: 286921585 Test: Tried using idlcli composePwle before/after setting prop Change-Id: Ibca473aef62b7cc8e84689ddba83a91daddb8d2e Signed-off-by: Nathan Kulczak --- device-felix.mk | 3 ++- vibrator/cs40l26/Hardware.h | 4 +--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/device-felix.mk b/device-felix.mk index e00d126..f065850 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -214,7 +214,8 @@ PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES +=\ ro.vendor.vibrator.hal.long.frequency.shift=0 \ ro.vendor.vibrator.hal.gpio.num=44 \ - ro.vendor.vibrator.hal.gpio.shift=2 + ro.vendor.vibrator.hal.gpio.shift=2 \ + persist.vendor.vibrator.hal.chirp.enabled=0 ACTUATOR_MODEL := luxshare_ict_lt_xlra1906d # Fingerprint diff --git a/vibrator/cs40l26/Hardware.h b/vibrator/cs40l26/Hardware.h index 51619e5..7ad4017 100644 --- a/vibrator/cs40l26/Hardware.h +++ b/vibrator/cs40l26/Hardware.h @@ -359,9 +359,7 @@ class HwCal : public Vibrator::HwCal, private HwCalBase { return true; } bool isChirpEnabled() override { - bool value; - getProperty("chirp.enabled", &value, false); - return value; + return utils::getProperty("persist.vendor.vibrator.hal.chirp.enabled", false); } bool getSupportedPrimitives(uint32_t *value) override { return getProperty("supported_primitives", value, (uint32_t)0); From 61519d18a6cb9a7c091fcf638202a032ff2a1cf0 Mon Sep 17 00:00:00 2001 From: dshivangi Date: Wed, 16 Aug 2023 18:16:41 +0000 Subject: [PATCH 07/48] Refine fold setting MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Current fold setting has a toggle button which can enable the “Stay unlocked on fold” setting. Create a new page for fold setting which will allow us to choose something from three options.(https://screenshot.googleplex.com/6W65aTYtigGpr3v) *Always - Front display turns on when you fold your device [Currently available setting] *Only games, videos, and more - Front display turns on for apps that stop your screen going idle [Default] *Never - Front display locks when you fold your device [New option for user] Test: atest FoldLockBehaviorSettingsTest FoldLockBehaviorPreferenceControllerTest *Manual Flash the build with these changes Manually select options one by one Observe the behavior Fixes: 294194379 Change-Id: I59e8ba653bdac397eec0be60b931dc1c6649843c --- felix/overlay/frameworks/base/core/res/res/values/config.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/felix/overlay/frameworks/base/core/res/res/values/config.xml b/felix/overlay/frameworks/base/core/res/res/values/config.xml index 1dae8a8..bd3dae6 100644 --- a/felix/overlay/frameworks/base/core/res/res/values/config.xml +++ b/felix/overlay/frameworks/base/core/res/res/values/config.xml @@ -41,6 +41,9 @@ this value to 0 so it has no effect. --> 0 + + true + 120 From 9901f4e467748e1ee0a638b8bb1dc7b90142b17b Mon Sep 17 00:00:00 2001 From: jimmyshiu Date: Fri, 1 Sep 2023 00:45:29 +0000 Subject: [PATCH 08/48] powerhint: Add DISPLAY_CHANGE hint Add DISPLAY_CHANGE hint for display layout change due to rotation or switching between inner and outer panels. Bug: 298150450 Test: build pass Change-Id: I0f7667c3368843b12bbc0bd3151864bde6367a00 --- powerhint.json | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/powerhint.json b/powerhint.json index 5c74ac1..86e962f 100644 --- a/powerhint.json +++ b/powerhint.json @@ -817,6 +817,71 @@ "Duration": 2000, "Value": "9999999" }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "ReducePreferIdle", + "Duration": 5000, + "Value": "0" + }, + { + "PowerHint": "DISPLAY_CHANGE_GPU", + "Node": "GPUDvfsPeriod", + "Duration": 1000, + "Value": "10" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "FGPreferIdle", + "Duration": 5000, + "Value": "1" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Type": "DoHint", + "Value": "DISPLAY_CHANGE_GPU" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "CPUBigClusterMaxFreq", + "Duration": 5000, + "Value": "9999999" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "CPUMidClusterMaxFreq", + "Duration": 5000, + "Value": "9999999" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "CPULittleClusterMaxFreq", + "Duration": 5000, + "Value": "9999999" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "TAUClampBoost", + "Duration": 5000, + "Value": "764" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "FGUClampBoost", + "Duration": 5000, + "Value": "159" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "MemFreq", + "Duration": 5000, + "Value": "3172000" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "NPITaskPacking", + "Duration": 5000, + "Value": "0" + }, { "PowerHint": "CPU_LOAD_RESET", "Node": "GPUMinFreq", From 85b930c6217da362c7400f19c7c8c21dd6dedcfd Mon Sep 17 00:00:00 2001 From: Yung Ti Su Date: Wed, 27 Sep 2023 09:06:14 +0000 Subject: [PATCH 09/48] add mixer path for BLE Bug: 302270637 Test: manual Change-Id: Id1581c98cf5a397bcd54f6b62200476547b5176e Signed-off-by: Yung Ti Su --- audio/felix/aidl_config/mixer_paths_aidl.xml | 92 ++++++++++++++++++++ 1 file changed, 92 insertions(+) diff --git a/audio/felix/aidl_config/mixer_paths_aidl.xml b/audio/felix/aidl_config/mixer_paths_aidl.xml index f9881e2..d44e685 100644 --- a/audio/felix/aidl_config/mixer_paths_aidl.xml +++ b/audio/felix/aidl_config/mixer_paths_aidl.xml @@ -416,6 +416,14 @@ + + + + + + + + @@ -476,6 +484,14 @@ + + + + + + + + @@ -536,6 +552,14 @@ + + + + + + + + @@ -601,6 +625,14 @@ + + + + + + + + @@ -661,6 +693,14 @@ + + + + + + + + @@ -733,6 +773,14 @@ + + + + + + + + @@ -851,6 +899,14 @@ + + + + + + + + @@ -885,6 +941,14 @@ + + + + + + + + @@ -913,6 +977,10 @@ + + + + @@ -937,6 +1005,10 @@ + + + + @@ -971,6 +1043,14 @@ + + + + + + + + @@ -1011,6 +1091,10 @@ + + + + @@ -1075,6 +1159,10 @@ + + + + @@ -1252,6 +1340,10 @@ + + + + From d315dcb7c8933c5cbf39ea6a3b60cd11a65c59da Mon Sep 17 00:00:00 2001 From: Shivangi Dubey Date: Wed, 27 Sep 2023 11:42:03 +0000 Subject: [PATCH 10/48] Enable Fold Lock Behavior in config.xml Enable Fold Lock Behavior in config.xml and let it be controlled by sysprop flag 'persist.fold_lock_setting_enabled'. Bug: 298200843 Test: Flash the device with this build. * Manually check if the setting accessible. Change-Id: Ide72528bfd40a6c7460a8ecb0565f1c791d4c8cf --- felix/overlay/frameworks/base/core/res/res/values/config.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/felix/overlay/frameworks/base/core/res/res/values/config.xml b/felix/overlay/frameworks/base/core/res/res/values/config.xml index 8899594..7d50be7 100644 --- a/felix/overlay/frameworks/base/core/res/res/values/config.xml +++ b/felix/overlay/frameworks/base/core/res/res/values/config.xml @@ -42,7 +42,7 @@ 0 - false + true 120 From 3f0932da8262bcf1883765c51a83d59c78d0a54a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= Date: Thu, 28 Sep 2023 00:29:55 +0000 Subject: [PATCH 11/48] OWNERS: master -> main Change-Id: I30553e39e50f0781cb5e330760fc8beefee036a6 --- OWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OWNERS b/OWNERS index 79003ba..7eed0c3 100644 --- a/OWNERS +++ b/OWNERS @@ -1,4 +1,4 @@ per-file powerhint.json = jychen@google.com,jenhaochen@google.com,wvw@google.com,joaodias@google.com # per-file for Pixel device makefiles, see go/pixel-device-mk-owner-checklist for details. -per-file *.mk,*/BoardConfig.mk=file:device/google/gs-common:master:/OWNERS +per-file *.mk,*/BoardConfig.mk=file:device/google/gs-common:main:/OWNERS From 0804c4be4d794661f56a24f23970c05a3b671097 Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Fri, 29 Sep 2023 01:14:25 +0000 Subject: [PATCH 12/48] Update felix SVN to 28 Bug: 302612466 Change-Id: If52eb638b160fd202e0511f6213fa5c5bce4975e --- device-felix.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-felix.mk b/device-felix.mk index a71da60..1c6461b 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -205,7 +205,7 @@ PRODUCT_SOONG_NAMESPACES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=27 + ro.vendor.build.svn=28 # Vibrator HAL PRODUCT_VENDOR_PROPERTIES +=\ From 348ba3055902f980c5ce78166a951fc9652ff1b9 Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Fri, 29 Sep 2023 01:15:53 +0000 Subject: [PATCH 13/48] Update felix SVN to 29 Bug: 302612466 Change-Id: Ia1f09da58824a8300e364bd3236fad0685ee5508 --- device-felix.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-felix.mk b/device-felix.mk index 1c6461b..b2ed3f2 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -205,7 +205,7 @@ PRODUCT_SOONG_NAMESPACES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=28 + ro.vendor.build.svn=29 # Vibrator HAL PRODUCT_VENDOR_PROPERTIES +=\ From ec6d75e7c38ace39ce96f368f00ec5b5b06c5d34 Mon Sep 17 00:00:00 2001 From: ClintChen Date: Mon, 2 Oct 2023 08:04:29 +0000 Subject: [PATCH 14/48] F10: Enable build flag versioning for radio and bootloader Bug: 301142125 Change-Id: I999d9a7c8c8278808ab29415fe903a5127d67941 --- felix/BoardConfig.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/felix/BoardConfig.mk b/felix/BoardConfig.mk index 3af8af8..ed731f9 100644 --- a/felix/BoardConfig.mk +++ b/felix/BoardConfig.mk @@ -20,6 +20,9 @@ BOARD_USES_GENERIC_AUDIO := true USES_DEVICE_GOOGLE_FELIX := true BOARD_KERNEL_CMDLINE += swiotlb=noforce +RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_FELIX_RADIO_DIR) +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := $(RELEASE_GOOGLE_FELIX_BOOTLOADER_DIR) + # Enable load module in parallel BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true From 865f89cab701de074f6983c8ffe470030207ec10 Mon Sep 17 00:00:00 2001 From: Alice Kuo Date: Wed, 4 Oct 2023 04:24:30 +0800 Subject: [PATCH 15/48] Add support 48_2 capability for LE audio HW offload Bug: 300788009 Test: manual test in UPF Change-Id: Ib8ed04dddb89885e132e660c0a86da88d93bf0c0 --- bluetooth/le_audio_codec_capabilities.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/bluetooth/le_audio_codec_capabilities.xml b/bluetooth/le_audio_codec_capabilities.xml index 89d0de6..5853138 100644 --- a/bluetooth/le_audio_codec_capabilities.xml +++ b/bluetooth/le_audio_codec_capabilities.xml @@ -32,6 +32,9 @@ + + + @@ -57,6 +60,9 @@ + + + @@ -68,6 +74,7 @@ + From 19bacab2ca484136cfaaff213f6c5fe710115e46 Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Mon, 9 Oct 2023 19:56:23 +0000 Subject: [PATCH 16/48] felix: Replace NFC app with NFC apex Bug: 303286040 Test: Compiles (cherry picked from https://android-review.googlesource.com/q/commit:ca8ad36fe840ab900fdd4bebdcf787b9463a3614) Merged-In: I9ae8d7630d18075b8620997582761787af1a65b4 Change-Id: I9ae8d7630d18075b8620997582761787af1a65b4 --- device-felix.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-felix.mk b/device-felix.mk index 487a4b8..116fce8 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -98,7 +98,7 @@ PRODUCT_COPY_FILES += \ device/google/felix/nfc/libnfc-nci-felix.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf PRODUCT_PACKAGES += \ - NfcNci \ + com.android.nfcservices \ Tag \ android.hardware.nfc-service.st From 806d6a25f14cc3e447d01c723997a5d44e6fd465 Mon Sep 17 00:00:00 2001 From: guibing Date: Wed, 2 Aug 2023 18:13:54 +0000 Subject: [PATCH 17/48] powerhint: felix: update vendor_sched procfs paths Vendor sched procfs path hierarchy gets updated in kernel. Update the paths in powerhint json file to match the change. Bug: 289151587 Test: UIbench ab test. Change-Id: I3028f9f97d65f92fd43651995790d3902d0883f7 --- powerhint.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/powerhint.json b/powerhint.json index 836b4ff..d3035a5 100644 --- a/powerhint.json +++ b/powerhint.json @@ -177,7 +177,7 @@ }, { "Name": "CAMUClampBoost", - "Path": "/proc/vendor_sched/cam_uclamp_min", + "Path": "/proc/vendor_sched/groups/cam/uclamp_min", "Values": [ "764", "0" @@ -186,7 +186,7 @@ }, { "Name": "TAUClampBoost", - "Path": "/proc/vendor_sched/ta_uclamp_min", + "Path": "/proc/vendor_sched/groups/ta/uclamp_min", "Values": [ "764", "1" @@ -195,7 +195,7 @@ }, { "Name": "FGUClampBoost", - "Path": "/proc/vendor_sched/fg_uclamp_min", + "Path": "/proc/vendor_sched/groups/fg/uclamp_min", "Values": [ "159", "0" @@ -204,7 +204,7 @@ }, { "Name": "MLUclampBoost", - "Path": "/proc/vendor_sched/nnapi_uclamp_min", + "Path": "/proc/vendor_sched/groups/nnapi/uclamp_min", "Values": [ "225", "813" @@ -223,7 +223,7 @@ }, { "Name": "CDPreferIdle", - "Path": "/proc/vendor_sched/cam_prefer_idle", + "Path": "/proc/vendor_sched/groups/cam/prefer_idle", "Values": [ "0", "1" @@ -269,7 +269,7 @@ }, { "Name": "TAPreferHighCap", - "Path": "/proc/vendor_sched/ta_prefer_high_cap", + "Path": "/proc/vendor_sched/groups/ta/prefer_high_cap", "Values": [ "1", "0" @@ -278,7 +278,7 @@ }, { "Name": "TAPreferIdle", - "Path": "/proc/vendor_sched/ta_prefer_idle", + "Path": "/proc/vendor_sched/groups/ta/prefer_idle", "Values": [ "0", "1" @@ -287,7 +287,7 @@ }, { "Name": "FGPreferIdle", - "Path": "/proc/vendor_sched/fg_prefer_idle", + "Path": "/proc/vendor_sched/groups/fg/prefer_idle", "Values": [ "1", "0" @@ -297,7 +297,7 @@ }, { "Name": "CDPreferHighCap", - "Path": "/proc/vendor_sched/cam_prefer_high_cap", + "Path": "/proc/vendor_sched/groups/cam/prefer_high_cap", "Values": [ "1", "0" @@ -671,7 +671,7 @@ }, { "Name": "Dex2oatGroup", - "Path": "/proc/vendor_sched/dex2oat_ug", + "Path": "/proc/vendor_sched/groups/dex2oat/ug", "Values": [ "1", "0" From 977f2468ab7c65432351ff7682df30788f121d9d Mon Sep 17 00:00:00 2001 From: Jenny Ho Date: Tue, 26 Sep 2023 04:19:47 +0800 Subject: [PATCH 18/48] Add permission for dual battery stats Bug: 293523710 Change-Id: I0ceca5cab49528110a21e486929c4ec20d1be58f Signed-off-by: Jenny Ho --- conf/init.felix.rc | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/init.felix.rc b/conf/init.felix.rc index 1b5ce74..ed12a3c 100644 --- a/conf/init.felix.rc +++ b/conf/init.felix.rc @@ -83,6 +83,7 @@ on early-boot # Wait for insmod_sh to finish all common modules wait_for_prop vendor.common.modules.ready 1 start insmod_sh_felix + chown system system /sys/class/power_supply/dualbatt/dbatt_stats service insmod_sh_felix /vendor/bin/insmod.sh /vendor/etc/init.insmod.felix.cfg class main From 7545c3acd757605dfbece506f30d3d8174d8df7c Mon Sep 17 00:00:00 2001 From: Alice Kuo Date: Wed, 11 Oct 2023 14:18:05 +0800 Subject: [PATCH 19/48] Add LE Audio allow list candidate device Bug: 300012501 Test: manual test Change-Id: I4833f33738899bba31158d0d6fbd43d9e3cd9f5e --- device-felix.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/device-felix.mk b/device-felix.mk index 487a4b8..5bdd3c1 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -369,6 +369,10 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_COPY_FILES += \ device/google/felix/bluetooth/le_audio_codec_capabilities.xml:$(TARGET_COPY_OUT_VENDOR)/etc/le_audio_codec_capabilities.xml +# LE Audio Unicast Allowlist +PRODUCT_PRODUCT_PROPERTIES += \ + persist.bluetooth.leaudio.allow_list=SM-R510 + # Bluetooth EWP test tool PRODUCT_PACKAGES_DEBUG += \ ewp_tool From 982803b81f719ed04ba7725e5cf2d25d3cde6bb9 Mon Sep 17 00:00:00 2001 From: Leo Chen Date: Fri, 6 Oct 2023 07:00:18 +0000 Subject: [PATCH 20/48] Update IDisplay to V10 Test: Build pass Bug: 299410182 Change-Id: I3d368dab1fde2f9cf5d4dea6730f28d45dfacc4f Signed-off-by: Leo Chen --- device_framework_matrix_product_felix.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device_framework_matrix_product_felix.xml b/device_framework_matrix_product_felix.xml index 7594e3c..90ef723 100644 --- a/device_framework_matrix_product_felix.xml +++ b/device_framework_matrix_product_felix.xml @@ -1,7 +1,7 @@ com.google.hardware.pixel.display - 9 + 10 IDisplay secondary From 9931ca082a643bd498f22cfa59d4d7954bce6e63 Mon Sep 17 00:00:00 2001 From: Shivakumar Neginal Date: Mon, 16 Oct 2023 20:33:18 +0000 Subject: [PATCH 21/48] Adding Fast Pair extended IDs for F10 Adding the Fast Pair extended IDs for felix so that Quick Start shows the right Fast Pair bottom sheet on other devices during setup. Bug: 305516133 Test: TBD Change-Id: Iec1e7b85e802e55b204d0bebfaf9c2f83ca588f2 --- device-felix.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/device-felix.mk b/device-felix.mk index 1c6461b..1a020a3 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -372,3 +372,8 @@ PRODUCT_PACKAGES_DEBUG += \ # Enable DeviceAsWebcam support PRODUCT_VENDOR_PROPERTIES += \ ro.usb.uvc.enabled=true + +# Quick Start device-specific settings +PRODUCT_PRODUCT_PROPERTIES += \ + ro.quick_start.oem_id=00e0 \ + ro.quick_start.device_id=felix From 3cd8690bf59c5c28f12fae65903c695c0749a20b Mon Sep 17 00:00:00 2001 From: Cheng Chang Date: Tue, 17 Oct 2023 07:57:42 +0000 Subject: [PATCH 22/48] gps: Enable Vzw SUPL OTDOA Bug: 303401506 Test: OTDOA test in b/303401506 Change-Id: I53bce7feff22c39c5a787fda1be3218a0f51e4b1 --- location/gps.xml.f10 | 2 +- location/gps_user.xml.f10 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/location/gps.xml.f10 b/location/gps.xml.f10 index 11d6397..e2cd884 100644 --- a/location/gps.xml.f10 +++ b/location/gps.xml.f10 @@ -35,7 +35,7 @@ SuplVersion="2" SuplMinorVersion="0" SuplOtdoaCapable="true" - SuplOtdoaCapable2="false" + SuplOtdoaCapable2="true" SuplGlonassCapable = "true" SuplGalileoCapable = "true" SuplBdsCapable = "true" diff --git a/location/gps_user.xml.f10 b/location/gps_user.xml.f10 index 9ea21bf..b0c3fdf 100644 --- a/location/gps_user.xml.f10 +++ b/location/gps_user.xml.f10 @@ -34,7 +34,7 @@ SuplVersion="2" SuplMinorVersion="0" SuplOtdoaCapable="true" - SuplOtdoaCapable2="false" + SuplOtdoaCapable2="true" SuplGlonassCapable = "true" SuplGalileoCapable = "true" SuplBdsCapable = "true" From 3f346b4849c3e98b9c881ec4a446381ac30d62c9 Mon Sep 17 00:00:00 2001 From: Chris Paulo Date: Tue, 17 Oct 2023 11:22:51 -0700 Subject: [PATCH 23/48] felix/vibrator: Update durations to match other projects Updated the duration of effects to match waveform durations. This will remove the added overhead durations which are not supposed to be part of the calculations for durations of effects. Bug: 305756647 Test: atest VibratorHalCs40l26TestSuitePrivate Change-Id: I66c761482b13969816630e89b9e79cfb729f6f5c Signed-off-by: Chris Paulo --- vibrator/cs40l26/Vibrator.cpp | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/vibrator/cs40l26/Vibrator.cpp b/vibrator/cs40l26/Vibrator.cpp index 5ad996a..7d5227e 100644 --- a/vibrator/cs40l26/Vibrator.cpp +++ b/vibrator/cs40l26/Vibrator.cpp @@ -55,11 +55,6 @@ static constexpr uint8_t VOLTAGE_SCALE_MAX = 100; static constexpr int8_t MAX_COLD_START_LATENCY_MS = 6; // I2C Transaction + DSP Return-From-Standby static constexpr int8_t MAX_PAUSE_TIMING_ERROR_MS = 1; // ALERT Irq Handling static constexpr uint32_t MAX_TIME_MS = UINT16_MAX; -static constexpr float SETTING_TIME_OVERHEAD = 26; // This time was combined by - // HAL set the effect to - // driver and the kernel - // executes the effect before - // chip play the effect static constexpr auto ASYNC_COMPLETION_TIMEOUT = std::chrono::milliseconds(100); static constexpr auto POLLING_TIMEOUT = 20; @@ -358,7 +353,7 @@ Vibrator::Vibrator(std::unique_ptr hwApiDefault, std::unique_ptr h mFfEffects.resize(WAVEFORM_MAX_INDEX); mEffectDurations.resize(WAVEFORM_MAX_INDEX); mEffectDurations = { - 1000, 100, 32, 1000, 300, 130, 150, 500, 100, 10, 12, 1000, 1000, 1000, + 1000, 100, 12, 1000, 300, 130, 150, 500, 100, 5, 12, 1000, 1000, 1000, }; /* 11+3 waveforms. The duration must < UINT16_MAX */ uint8_t effectIndex; @@ -701,8 +696,8 @@ ndk::ScopedAStatus Vibrator::getPrimitiveDuration(CompositePrimitive primitive, if (!status.isOk()) { return status; } - // Please check the overhead time detail in b/261841035 - *durationMs = mEffectDurations[effectIndex] + SETTING_TIME_OVERHEAD; + + *durationMs = mEffectDurations[effectIndex]; } else { *durationMs = 0; } From 0dd2f0fc9ca47bde6a7b08876d3476e9f32aff3a Mon Sep 17 00:00:00 2001 From: Cyan_Hsieh Date: Mon, 23 Oct 2023 22:04:51 +0800 Subject: [PATCH 24/48] Split bootloader prebuilt to 24Q1 and trunk version Bug: 299879102 Change-Id: I9c28b2dac2515657ec1ca4b2e252024de91319cf --- device-felix.mk | 5 +++++ felix/BoardConfig.mk | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/device-felix.mk b/device-felix.mk index bb1070f..97a5709 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -254,6 +254,11 @@ PRODUCT_PACKAGES += \ # Trusty liboemcrypto.so PRODUCT_SOONG_NAMESPACES += vendor/google_devices/felix/prebuilts +ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/felix/prebuilts/trusty/24Q1 +else +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/felix/prebuilts/trusty/trunk +endif # Set zram size PRODUCT_VENDOR_PROPERTIES += \ diff --git a/felix/BoardConfig.mk b/felix/BoardConfig.mk index ed731f9..72b542b 100644 --- a/felix/BoardConfig.mk +++ b/felix/BoardConfig.mk @@ -21,7 +21,11 @@ USES_DEVICE_GOOGLE_FELIX := true BOARD_KERNEL_CMDLINE += swiotlb=noforce RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_FELIX_RADIO_DIR) -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := $(RELEASE_GOOGLE_FELIX_BOOTLOADER_DIR) +ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1 +else +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk +endif # Enable load module in parallel BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true From 8ad0e2cf934b7509901962c70e69b89634bb778f Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Fri, 29 Sep 2023 01:14:25 +0000 Subject: [PATCH 25/48] Update felix SVN to 28 Bug: 302612466 Change-Id: If52eb638b160fd202e0511f6213fa5c5bce4975e --- device-felix.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-felix.mk b/device-felix.mk index 826e8f6..d30170a 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -205,7 +205,7 @@ PRODUCT_SOONG_NAMESPACES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=27 + ro.vendor.build.svn=28 # Vibrator HAL PRODUCT_VENDOR_PROPERTIES +=\ From 0c650e810d598f67b21cb0f862c12c1d4fd68490 Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Fri, 29 Sep 2023 01:15:53 +0000 Subject: [PATCH 26/48] Update felix SVN to 29 Bug: 302612466 Change-Id: Ia1f09da58824a8300e364bd3236fad0685ee5508 --- device-felix.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-felix.mk b/device-felix.mk index d30170a..8fa08b7 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -205,7 +205,7 @@ PRODUCT_SOONG_NAMESPACES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=28 + ro.vendor.build.svn=29 # Vibrator HAL PRODUCT_VENDOR_PROPERTIES +=\ From 2d13c2fd2bbc1164beca59490ca0f1c88c25a256 Mon Sep 17 00:00:00 2001 From: Greg Kaiser Date: Wed, 25 Oct 2023 15:35:41 -0600 Subject: [PATCH 27/48] Fix lunch choices for git_main We add "trunk_staging-" for all COMMON_LUNCH_CHOICES so they are valid in the trunk stable setup. Bug: 307738446 Test: lunch Change-Id: I441fde351191dfa28e48a54538249be57310971f --- AndroidProducts.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AndroidProducts.mk b/AndroidProducts.mk index ac74518..b608428 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -21,4 +21,4 @@ PRODUCT_MAKEFILES := \ COMMON_LUNCH_CHOICES := \ - aosp_felix-userdebug + aosp_felix-trunk_staging-userdebug From acd9c7a658123df92ee49b358b01bc5811911905 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Thu, 26 Oct 2023 05:24:04 +0000 Subject: [PATCH 28/48] Update felix SVN to 30 Bug: 302612466 Change-Id: Idf4b4f1f1f14b86b3205ba8249e0aeb0fb377359 --- device-felix.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-felix.mk b/device-felix.mk index b2ed3f2..f8c31e6 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -205,7 +205,7 @@ PRODUCT_SOONG_NAMESPACES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=29 + ro.vendor.build.svn=30 # Vibrator HAL PRODUCT_VENDOR_PROPERTIES +=\ From 0a08ee73c638b457fff6060e364167fd9adbb475 Mon Sep 17 00:00:00 2001 From: Will Song Date: Fri, 27 Oct 2023 21:37:11 +0000 Subject: [PATCH 29/48] PREUPLOAD: Enforce jsonlint in preupload Checks syntax and simple brace balances for all JSON files. Test: Edit any json and try upload Bug: 127794899 Change-Id: Ife780a176c9b7599b7c3653b85ea4a144d0e567e --- PREUPLOAD.cfg | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 PREUPLOAD.cfg diff --git a/PREUPLOAD.cfg b/PREUPLOAD.cfg new file mode 100644 index 0000000..37ebb5e --- /dev/null +++ b/PREUPLOAD.cfg @@ -0,0 +1,2 @@ +[Builtin Hooks] +jsonlint = true From 099bd7fd13f0b71f0bbb92fa55b350272015c176 Mon Sep 17 00:00:00 2001 From: Shin-Yu Wang Date: Mon, 30 Oct 2023 14:45:56 +0000 Subject: [PATCH 30/48] Update idle timer setting Bug: 308140167 Test: check result of `adb shell getprop ro.surface_flinger.set_idle_timer_ms` Change-Id: I873e69c385d787567a14427c007fa834c1a66062 --- device-felix.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-felix.mk b/device-felix.mk index 1708660..ee45576 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -241,7 +241,7 @@ PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.enable_frame_rate_override=true PRODUCT_DEFAULT_PROPERTY_OVERRIDES += debug.sf.set_idle_timer_ms_4619827677550801152=80 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += debug.sf.support_kernel_idle_timer_4619827677550801152=true -PRODUCT_DEFAULT_PROPERTY_OVERRIDES += debug.sf.set_idle_timer_ms_4619827677550801153=1500 +PRODUCT_DEFAULT_PROPERTY_OVERRIDES += debug.sf.set_idle_timer_ms_4619827677550801153=1000 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += debug.sf.support_kernel_idle_timer_4619827677550801153=false # Set zram size From 09c1ce320b7948c069bc48645b90eb55cae2bd3e Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Sat, 4 Nov 2023 14:58:26 +0000 Subject: [PATCH 31/48] Revert "felix: Replace NFC app with NFC apex" Revert submission 24993894-cherrypicker-L80100000963393177:N49200001411943056 Reason for revert: Causing bootloop with signed builds Reverted changes: /q/submissionid:24993894-cherrypicker-L80100000963393177:N49200001411943056 Bug: 309117462 Change-Id: Ib09ea604351cea2c4ed40e64c0bf783a666eb08b Test: Compiles, device boots up --- device-felix.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-felix.mk b/device-felix.mk index 116fce8..487a4b8 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -98,7 +98,7 @@ PRODUCT_COPY_FILES += \ device/google/felix/nfc/libnfc-nci-felix.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf PRODUCT_PACKAGES += \ - com.android.nfcservices \ + NfcNci \ Tag \ android.hardware.nfc-service.st From e274b4177afaa690f9bb218bec0a80a2cdc99643 Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Sat, 4 Nov 2023 19:04:38 +0000 Subject: [PATCH 32/48] Revert "felix(nfc): Modify NFC overlays for NFC apex" Revert submission 2802548-nfc_apex Reason for revert: Causing bootloop with signed builds Reverted changes: /q/submissionid:2802548-nfc_apex Bug: 309117462 Test: Compiles, device boots up (cherry picked from https://android-review.googlesource.com/q/commit:9b9ed35e2791458c36b792ee049972c978b75606) Merged-In: Ic36d5e92cb4dd5b842cbf0d5de81a0548d63c77f Change-Id: Ic36d5e92cb4dd5b842cbf0d5de81a0548d63c77f --- device-felix.mk | 3 +-- .../packages/apps/Nfc}/res/values/config.xml | 0 rro_overlays/NfcOverlay/Android.bp | 9 ------- rro_overlays/NfcOverlay/AndroidManifest.xml | 27 ------------------- rro_overlays/NfcOverlay/OWNERS | 2 -- 5 files changed, 1 insertion(+), 40 deletions(-) rename {rro_overlays/NfcOverlay => felix/overlay/packages/apps/Nfc}/res/values/config.xml (100%) delete mode 100644 rro_overlays/NfcOverlay/Android.bp delete mode 100644 rro_overlays/NfcOverlay/AndroidManifest.xml delete mode 100644 rro_overlays/NfcOverlay/OWNERS diff --git a/device-felix.mk b/device-felix.mk index 1708660..3680bee 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -102,8 +102,7 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ com.android.nfcservices \ Tag \ - android.hardware.nfc-service.st \ - NfcOverlayFelix + android.hardware.nfc-service.st # SecureElement PRODUCT_PACKAGES += \ diff --git a/rro_overlays/NfcOverlay/res/values/config.xml b/felix/overlay/packages/apps/Nfc/res/values/config.xml similarity index 100% rename from rro_overlays/NfcOverlay/res/values/config.xml rename to felix/overlay/packages/apps/Nfc/res/values/config.xml diff --git a/rro_overlays/NfcOverlay/Android.bp b/rro_overlays/NfcOverlay/Android.bp deleted file mode 100644 index 580f845..0000000 --- a/rro_overlays/NfcOverlay/Android.bp +++ /dev/null @@ -1,9 +0,0 @@ -package { - default_applicable_licenses: ["device_google_felix_license"], -} - -runtime_resource_overlay { - name: "NfcOverlayFelix", - sdk_version: "current", - product_specific: true -} diff --git a/rro_overlays/NfcOverlay/AndroidManifest.xml b/rro_overlays/NfcOverlay/AndroidManifest.xml deleted file mode 100644 index 5241aa4..0000000 --- a/rro_overlays/NfcOverlay/AndroidManifest.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - diff --git a/rro_overlays/NfcOverlay/OWNERS b/rro_overlays/NfcOverlay/OWNERS deleted file mode 100644 index 35e9713..0000000 --- a/rro_overlays/NfcOverlay/OWNERS +++ /dev/null @@ -1,2 +0,0 @@ -# Bug component: 48448 -include platform/packages/apps/Nfc:/OWNERS From a2276085171771116434591becc521d994814db2 Mon Sep 17 00:00:00 2001 From: paulsu Date: Tue, 26 Sep 2023 03:15:24 +0000 Subject: [PATCH 33/48] Powerhint update containing PMU and EM tuning for 30FPS Port from ag/20028064 Bug: 262668624 Test: Local test Change-Id: Ia2cd6e1c55fdc2d2cefb507782208cd19dc651df Signed-off-by: paulsu --- powerhint.json | 61 +++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 56 insertions(+), 5 deletions(-) diff --git a/powerhint.json b/powerhint.json index d3035a5..95b7535 100644 --- a/powerhint.json +++ b/powerhint.json @@ -551,6 +551,15 @@ "0" ] }, + { + "Name": "EM_Profile", + "Path": "/sys/kernel/pixel_em/active_profile", + "Values": [ + "default", + "cam1" + ], + "DefaultIndex": 0 + }, { "Name": "PMU_POLL", "Path": "/proc/vendor_sched/pmu_poll_enable", @@ -1454,21 +1463,63 @@ }, { "PowerHint": "CAMERA_STREAMING_STANDARD", - "Node": "CPUBigClusterMaxFreq", + "Node": "PMU_POLL", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "EM_Profile", + "Duration": 0, + "Value": "cam1" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "PMU_LIT_LCPI_THRESHOLD", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "PMU_LIT_SPC_THRESHOLD", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "PMU_MID_LIMIT_FREQ", + "Duration": 0, + "Value": "1836000" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "PMU_MID_LCPI_THRESHOLD", + "Duration": 0, + "Value": "3" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "PMU_MID_SPC_THRESHOLD", + "Duration": 0, + "Value": "50" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "PMU_BIG_LIMIT_FREQ", "Duration": 0, "Value": "1826000" }, { "PowerHint": "CAMERA_STREAMING_STANDARD", - "Node": "CPUMidClusterMaxFreq", + "Node": "PMU_BIG_LCPI_THRESHOLD", "Duration": 0, - "Value": "1491000" + "Value": "3" }, { "PowerHint": "CAMERA_STREAMING_STANDARD", - "Node": "CPULittleClusterMaxFreq", + "Node": "PMU_BIG_SPC_THRESHOLD", "Duration": 0, - "Value": "1401000" + "Value": "50" }, { "PowerHint": "CAMERA_STREAMING_STANDARD", From e32682b14c23472050480ea319cc0cb0edde22bd Mon Sep 17 00:00:00 2001 From: Poomarin Phloyphisut Date: Tue, 7 Nov 2023 07:01:15 +0000 Subject: [PATCH 34/48] [CCA] Set enable flag by default on Felix. Bug: 309566086 Test: N/A Change-Id: Ibf847c16f69d8606b2fec8fe82930a7149632290 --- device-felix.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-felix.mk b/device-felix.mk index bb1070f..84b4dfc 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -303,7 +303,7 @@ PRODUCT_VENDOR_PROPERTIES += \ ##Audio Vendor property PRODUCT_PROPERTY_OVERRIDES += \ - persist.vendor.audio.cca.enabled=true + persist.vendor.audio.cca.enabled=false # Camera PRODUCT_PROPERTY_OVERRIDES += \ From 55b74d41e9d31c338f98e2d2fac51b31570d7755 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Tue, 7 Nov 2023 03:20:47 +0000 Subject: [PATCH 35/48] Update felix SVN to 31 Bug: 302612466 Change-Id: Id914c4cfcb72b896b750446b663bd9e2be43e34e --- device-felix.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-felix.mk b/device-felix.mk index 4bd6ec1..c145cd3 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -205,7 +205,7 @@ PRODUCT_SOONG_NAMESPACES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=30 + ro.vendor.build.svn=31 # Vibrator HAL PRODUCT_VENDOR_PROPERTIES +=\ From fbb91bcaa4722748c1226a4ad286f1953d49f860 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Sat, 11 Nov 2023 02:31:30 +0000 Subject: [PATCH 36/48] Update felix SVN to 32 Bug: 309529736 Change-Id: I848a8e5489e68040ae10ec18760497a6c6a86500 --- device-felix.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-felix.mk b/device-felix.mk index c145cd3..3b1173d 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -205,7 +205,7 @@ PRODUCT_SOONG_NAMESPACES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=31 + ro.vendor.build.svn=32 # Vibrator HAL PRODUCT_VENDOR_PROPERTIES +=\ From cbb27f3c01ab84fcd0fb3ac9a1b43dbb13c23873 Mon Sep 17 00:00:00 2001 From: Jack Wu Date: Fri, 10 Nov 2023 20:35:19 +0800 Subject: [PATCH 37/48] felix: update AIDL IGoogleBattery manifest version to 3 Bug: 309518527 Test: TH Change-Id: I191acadc6814a8c3ea413438dab772c5a4ea6ce1 Signed-off-by: Jack Wu --- manifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.xml b/manifest.xml index 56f489c..0f075c1 100644 --- a/manifest.xml +++ b/manifest.xml @@ -114,7 +114,7 @@ vendor.google.google_battery - 2 + 2-3 IGoogleBattery default From faf934e25813451a432dd34ed2091d90e5a8d4a7 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Tue, 14 Nov 2023 04:01:50 +0000 Subject: [PATCH 38/48] Update felix SVN to 33 Bug: 309529736 Change-Id: Ic9fcbd860c7882a10f49123e931799a81a6fc059 --- device-felix.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-felix.mk b/device-felix.mk index 3b1173d..368ec51 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -205,7 +205,7 @@ PRODUCT_SOONG_NAMESPACES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=32 + ro.vendor.build.svn=33 # Vibrator HAL PRODUCT_VENDOR_PROPERTIES +=\ From 11d33159070c2b3dcb0d0de1e5de0ad2e7f044ef Mon Sep 17 00:00:00 2001 From: Jack Wu Date: Mon, 27 Nov 2023 17:54:59 +0800 Subject: [PATCH 39/48] felix: update AIDL IGoogleBattery manifest version to 3 Bug: 313379822 Test: TH Change-Id: I0b190e62c67eaf9e0115a7355abf50f1663acc40 Signed-off-by: Jack Wu --- manifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.xml b/manifest.xml index 0f075c1..ae2f526 100644 --- a/manifest.xml +++ b/manifest.xml @@ -114,7 +114,7 @@ vendor.google.google_battery - 2-3 + 3 IGoogleBattery default From 70828aea7cc6f3643c4bfa58242f9c50dac1c4dd Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 29 Nov 2023 06:34:49 +0000 Subject: [PATCH 40/48] Update felix SVN to 34 Bug: 313696499 Change-Id: I8e4178345c1e91d3dd7b203ac4462e29c07aff0b --- device-felix.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-felix.mk b/device-felix.mk index 368ec51..fb1c0f1 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -205,7 +205,7 @@ PRODUCT_SOONG_NAMESPACES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=33 + ro.vendor.build.svn=34 # Vibrator HAL PRODUCT_VENDOR_PROPERTIES +=\ From a2ba6a362633b2dcd02a4df6c6dca5bfca20b46a Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 29 Nov 2023 06:38:45 +0000 Subject: [PATCH 41/48] Update felix SVN to 35 Bug: 313696499 Change-Id: I0e48bc56e019bcec717685f2e9f2ce2ce23f06af --- device-felix.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-felix.mk b/device-felix.mk index fb1c0f1..df38a1b 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -205,7 +205,7 @@ PRODUCT_SOONG_NAMESPACES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=34 + ro.vendor.build.svn=35 # Vibrator HAL PRODUCT_VENDOR_PROPERTIES +=\ From 88bf1ddb44376034ec4975e83978715fec1d2c85 Mon Sep 17 00:00:00 2001 From: Hawkwood Glazier Date: Fri, 1 Dec 2023 21:35:45 +0000 Subject: [PATCH 42/48] Modify folded smartspace postioning on felix Flag: NONE Bug: 313530576 Test: Manually checked positioning Change-Id: I2d326eb259aee2b33aa8bd90abed09bb118d6b3c --- .../base/packages/SystemUI/res-keyguard/values/dimens.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/felix/overlay/frameworks/base/packages/SystemUI/res-keyguard/values/dimens.xml b/felix/overlay/frameworks/base/packages/SystemUI/res-keyguard/values/dimens.xml index 9cbf278..4f1e1f3 100644 --- a/felix/overlay/frameworks/base/packages/SystemUI/res-keyguard/values/dimens.xml +++ b/felix/overlay/frameworks/base/packages/SystemUI/res-keyguard/values/dimens.xml @@ -19,5 +19,5 @@ 0.85 -40dp - -5dp + -15dp From d67ac5d535e382e03ce2be6ebcd73f50e5aea4e2 Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Fri, 1 Dec 2023 19:19:56 +0000 Subject: [PATCH 43/48] Revert^2 "felix: Replace NFC app with NFC apex" 09c1ce320b7948c069bc48645b90eb55cae2bd3e Bug: 303286040 Test: Compiles Change-Id: I958b2a07dbde6f036b3a615fde6e4255c59a0843 --- device-felix.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-felix.mk b/device-felix.mk index 11d4fe9..eb322e2 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -100,7 +100,7 @@ PRODUCT_COPY_FILES += \ device/google/felix/nfc/libnfc-nci-felix.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf PRODUCT_PACKAGES += \ - NfcNci \ + $(RELEASE_PACKAGE_NFC_STACK) \ Tag \ android.hardware.nfc-service.st From 7777a61a891357a9e50ca21d9b6ac730647dc995 Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Fri, 1 Dec 2023 19:19:56 +0000 Subject: [PATCH 44/48] Revert^2 "felix(nfc): Modify NFC overlays for NFC apex" e274b4177afaa690f9bb218bec0a80a2cdc99643 Bug: 303286040 Test: Compiles Change-Id: I56beefccd8cd5f5d12f6b867a31af60314826242 --- device-felix.mk | 3 +- rro_overlays/NfcOverlay/Android.bp | 9 +++++ rro_overlays/NfcOverlay/AndroidManifest.xml | 27 ++++++++++++++ rro_overlays/NfcOverlay/OWNERS | 2 ++ rro_overlays/NfcOverlay/res/values/config.xml | 35 +++++++++++++++++++ 5 files changed, 75 insertions(+), 1 deletion(-) create mode 100644 rro_overlays/NfcOverlay/Android.bp create mode 100644 rro_overlays/NfcOverlay/AndroidManifest.xml create mode 100644 rro_overlays/NfcOverlay/OWNERS create mode 100644 rro_overlays/NfcOverlay/res/values/config.xml diff --git a/device-felix.mk b/device-felix.mk index eb322e2..2e36329 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -102,7 +102,8 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ $(RELEASE_PACKAGE_NFC_STACK) \ Tag \ - android.hardware.nfc-service.st + android.hardware.nfc-service.st \ + NfcOverlayFelix # SecureElement PRODUCT_PACKAGES += \ diff --git a/rro_overlays/NfcOverlay/Android.bp b/rro_overlays/NfcOverlay/Android.bp new file mode 100644 index 0000000..580f845 --- /dev/null +++ b/rro_overlays/NfcOverlay/Android.bp @@ -0,0 +1,9 @@ +package { + default_applicable_licenses: ["device_google_felix_license"], +} + +runtime_resource_overlay { + name: "NfcOverlayFelix", + sdk_version: "current", + product_specific: true +} diff --git a/rro_overlays/NfcOverlay/AndroidManifest.xml b/rro_overlays/NfcOverlay/AndroidManifest.xml new file mode 100644 index 0000000..5241aa4 --- /dev/null +++ b/rro_overlays/NfcOverlay/AndroidManifest.xml @@ -0,0 +1,27 @@ + + + + + + + diff --git a/rro_overlays/NfcOverlay/OWNERS b/rro_overlays/NfcOverlay/OWNERS new file mode 100644 index 0000000..35e9713 --- /dev/null +++ b/rro_overlays/NfcOverlay/OWNERS @@ -0,0 +1,2 @@ +# Bug component: 48448 +include platform/packages/apps/Nfc:/OWNERS diff --git a/rro_overlays/NfcOverlay/res/values/config.xml b/rro_overlays/NfcOverlay/res/values/config.xml new file mode 100644 index 0000000..5e89b28 --- /dev/null +++ b/rro_overlays/NfcOverlay/res/values/config.xml @@ -0,0 +1,35 @@ + + + + true + + G9FPL + G0B96 + + true + + 160 + 140 + true + + 90 + 30 + + + 103 + 103 + + From ec09d678cb892273de4ac2f0cf726a4e94031b49 Mon Sep 17 00:00:00 2001 From: David Chen Date: Thu, 30 Nov 2023 09:21:27 +0000 Subject: [PATCH 45/48] Add zoom boost in powerhint for F10 This patch is meant to reduce frame drop rate in 60FPS video recording with zoom in/out. The boost will be triggered at 60FPS video recording while zoom ratio change (for each request that contain zoom ratio control in metadata), and will last for 15 frames. Test: gca_smoke_test Bug: 305613607 Change-Id: Ia2a6a452cf2ac7b8ee7a1bd53e5085582d79a2be --- powerhint.json | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/powerhint.json b/powerhint.json index 95b7535..fbcc819 100644 --- a/powerhint.json +++ b/powerhint.json @@ -319,7 +319,7 @@ "Values": [ "0", "1" - ], + ] }, { "Name": "DisplayWakeup", @@ -1053,6 +1053,18 @@ "Duration": 1000, "Value": "664000" }, + { + "PowerHint": "CAMERA_ZOOMING_BOOST", + "Node": "CDPreferIdle", + "Duration": 100, + "Value": "1" + }, + { + "PowerHint": "CAMERA_ZOOMING_BOOST", + "Node": "PMU_POLL", + "Duration": 100, + "Value": "0" + }, { "PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK1", "Node": "TAPreferHighCap", From 6df29a10ccce498cb87fafcc7a1c65a0209ed146 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 29 Nov 2023 23:51:45 +0000 Subject: [PATCH 46/48] Update felix SVN to 36 Bug: 313797924 Change-Id: I899429fe04a85e1967a913d4887f9528b4f162d9 --- device-felix.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-felix.mk b/device-felix.mk index df38a1b..c27b6ff 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -205,7 +205,7 @@ PRODUCT_SOONG_NAMESPACES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=35 + ro.vendor.build.svn=36 # Vibrator HAL PRODUCT_VENDOR_PROPERTIES +=\ From fbf929ec6a5084b306ed0ba3eb1afaf10af86204 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 29 Nov 2023 23:52:46 +0000 Subject: [PATCH 47/48] Update felix SVN to 37 Bug: 313797924 Change-Id: Ibbf8f514b3ecfa8013d9cc1138f0df8f8835d411 --- device-felix.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-felix.mk b/device-felix.mk index c27b6ff..4ea3595 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -205,7 +205,7 @@ PRODUCT_SOONG_NAMESPACES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=36 + ro.vendor.build.svn=37 # Vibrator HAL PRODUCT_VENDOR_PROPERTIES +=\ From 302f0a318f78af33430ca717269a215b6fdc47e4 Mon Sep 17 00:00:00 2001 From: Cyan_Hsieh Date: Wed, 13 Dec 2023 17:03:08 +0800 Subject: [PATCH 48/48] Branch bootloader prebuilts for 24Q2 release Bug: 313350495 Change-Id: Id61bda25845fd181ade10f12e3bc3554db4f6978 --- device-felix.mk | 2 ++ felix/BoardConfig.mk | 2 ++ 2 files changed, 4 insertions(+) diff --git a/device-felix.mk b/device-felix.mk index 84fe534..b1a0caa 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -257,6 +257,8 @@ PRODUCT_PACKAGES += \ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/felix/prebuilts ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/felix/prebuilts/trusty/24Q1 +else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/felix/prebuilts/trusty/24Q2 else PRODUCT_SOONG_NAMESPACES += vendor/google_devices/felix/prebuilts/trusty/trunk endif diff --git a/felix/BoardConfig.mk b/felix/BoardConfig.mk index 72b542b..1aaac33 100644 --- a/felix/BoardConfig.mk +++ b/felix/BoardConfig.mk @@ -23,6 +23,8 @@ BOARD_KERNEL_CMDLINE += swiotlb=noforce RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_FELIX_RADIO_DIR) ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1 +else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2 else RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk endif