From 4d7babd833aed61e4d287f276e61138bdd3ece5f Mon Sep 17 00:00:00 2001 From: Isaac Chiou Date: Thu, 14 Nov 2024 06:11:20 +0000 Subject: [PATCH 1/7] Enable open source multi akm for specific Broadcom project For cross akm roaming function, we have two ways in supplicant : 1. Open source way. 2. Broadcom specific way. Originally, Broadcom projects follow way 2 due to the limitation of the driver. For now, we plan to move all Broadcom projects to follow way 1 to make supplicant code clean and downsteam without conflict. For those projects which is ready for way 1, we control it to follow way 1 with WIFI_BRCM_OPEN_SOURCE_MULTI_AKM config. For the rest of Broadcom projects, we still follow way 2 until the multiple AKMs is fully supported by driver and verified. For ongoing Broadcom project, we also need to exercise the open source path in supplicant to do multiple AKM configuration to comply with WFA Wifi 7 AKM24 specification (b/331896542 ). Bug: 246871098 Test: AU drop test Test: Cross AKM roaming test Flag: EXEMPT enable control flag for aosp akms Change-Id: I70165b0af3271ef4835119d1c7cd5a906cf4cb59 --- wifi/BoardConfig-wifi.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/wifi/BoardConfig-wifi.mk b/wifi/BoardConfig-wifi.mk index dcec4ca..a1dc3e2 100644 --- a/wifi/BoardConfig-wifi.mk +++ b/wifi/BoardConfig-wifi.mk @@ -31,6 +31,7 @@ WIFI_AVOID_IFACE_RESET_MAC_CHANGE := true WIFI_FEATURE_HOSTAPD_11AX := true BOARD_HOSTAPD_CONFIG_80211W_MFP_OPTIONAL := true WIFI_HIDL_UNIFIED_SUPPLICANT_SERVICE_RC_ENTRY := true +WIFI_BRCM_OPEN_SOURCE_MULTI_AKM := enabled PRODUCT_COPY_FILES += \ device/google/felix/wifi/p2p_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant_overlay.conf \ From 6cc7a91ca5657fe2c83050ef721e764127e4771f Mon Sep 17 00:00:00 2001 From: Paulsu Su Date: Wed, 15 Jan 2025 00:47:33 -0800 Subject: [PATCH 2/7] powerhint: Mask hints in AA and DISPLAY_IDLE This CL adds a powerhint for AA mode to mask storming hint. DISPLAY_IDLE masks DISPLAY_UPDATE_IMMINENT and CPU_LOAD_RESET when Android Auto property is set. When navigation in Android Auto, the two hint with action to boost memlat is costly. Bug: 380188115 Change-Id: I825a56ac32a0ecdc8b441af9cb64e81b1d04f9a6 Test: Local test with desktop_head_unit_internal Flag: EXEMPT powerhint change --- powerhint.json | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/powerhint.json b/powerhint.json index a827cdb..eab4c54 100644 --- a/powerhint.json +++ b/powerhint.json @@ -757,6 +757,16 @@ ], "DefaultIndex": 0, "ResetOnInit": true + }, + { + "Name": "AAModeProperty", + "Path": "vendor.powerhal.mode.aa", + "Values": [ + "1", + "0" + ], + "ResetOnInit": true, + "Type": "Property" } ], "Actions": [ @@ -2054,6 +2064,12 @@ "Duration": 0, "Value": "1" }, + { + "PowerHint": "AUTOMOTIVE_PROJECTION", + "Node": "AAModeProperty", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "DISPLAY_IDLE", "Node": "FGPreferIdle", @@ -2071,6 +2087,18 @@ "Type": "EndHint", "Value": "DISPLAY_UPDATE_IMMINENT" }, + { + "PowerHint": "DISPLAY_IDLE", + "Type": "MaskHint", + "Value":"DISPLAY_UPDATE_IMMINENT", + "EnableProperty": "vendor.powerhal.mode.aa" + }, + { + "PowerHint": "DISPLAY_IDLE", + "Type": "MaskHint", + "Value":"CPU_LOAD_RESET", + "EnableProperty": "vendor.powerhal.mode.aa" + }, { "PowerHint": "DISPLAY_UPDATE_IMMINENT", "Node": "DisplayWakeup", From 20604eeb21b2a2ffe4741d0ab11860164866141a Mon Sep 17 00:00:00 2001 From: Angela Wang Date: Wed, 15 Jan 2025 09:14:13 +0000 Subject: [PATCH 3/7] Hide LE audio toggle for ASHA device on F10 Set bluetooth.leaudio.toggle_for_asha to false Flag: EXEMPT properties change only Bug: 390070780 Test: m Change-Id: Ia1d5ef7734f3a7664fd7e01e9188873de5df1a44 --- device-felix.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/device-felix.mk b/device-felix.mk index 502a614..5941eac 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -443,6 +443,10 @@ PRODUCT_PACKAGES_DEBUG += \ PRODUCT_PRODUCT_PROPERTIES += \ bluetooth.profile.hap.enabled_by_default=false +# Disable Bluetooth LE Audio toggle for ASHA device +PRODUCT_PRODUCT_PROPERTIES += \ + bluetooth.leaudio.toggle_visible_for_asha=false + # Enable DeviceAsWebcam support PRODUCT_VENDOR_PROPERTIES += \ ro.usb.uvc.enabled=true From 4995c6b3c20d6be744b0e8c1a14315ec785322b2 Mon Sep 17 00:00:00 2001 From: guibing Date: Mon, 3 Feb 2025 19:22:02 +0000 Subject: [PATCH 4/7] ADPF:felix: remove unused adpf profiles. Bug: 393196667 Test: adb shell dumpsys android.hardware.power.IPower/default Flag: NONE powerhal doesn't have a flag yet Change-Id: I3e1fe7eb31b34118aa520b1d7afa817cac7c3d4a --- powerhint.json | 72 -------------------------------------------------- 1 file changed, 72 deletions(-) diff --git a/powerhint.json b/powerhint.json index eab4c54..72e8330 100644 --- a/powerhint.json +++ b/powerhint.json @@ -2424,78 +2424,6 @@ "JankCheckTimeFactor": 1.2, "LowFrameRateThreshold": 25, "MaxRecordsNum": 300 - }, - { - "Name": "UiHighBoostWithoutPid", - "PID_On": false, - "PID_Po": 0, - "PID_Pu": 0, - "PID_I": 0, - "PID_I_Init": 0, - "PID_I_High": 0, - "PID_I_Low": 0, - "PID_Do": 0, - "PID_Du": 0, - "SamplingWindow_P": 1, - "SamplingWindow_I": 1, - "SamplingWindow_D": 1, - "UclampMin_On": true, - "UclampMin_Init": 250, - "UclampMin_High": 197, - "UclampMin_Low": 197, - "UclampMax_EfficientBase": 500, - "UclampMax_EfficientOffset": 200, - "ReportingRateLimitNs": 1, - "TargetTimeFactor": 1.0, - "StaleTimeFactor": 5.0 - }, - { - "Name": "UiLowBoostWithoutPid", - "PID_On": false, - "PID_Po": 0, - "PID_Pu": 0, - "PID_I": 0, - "PID_I_Init": 0, - "PID_I_High": 0, - "PID_I_Low": 0, - "PID_Do": 0, - "PID_Du": 0, - "SamplingWindow_P": 1, - "SamplingWindow_I": 1, - "SamplingWindow_D": 1, - "UclampMin_On": true, - "UclampMin_Init": 250, - "UclampMin_High": 53, - "UclampMin_Low": 53, - "UclampMax_EfficientBase": 500, - "UclampMax_EfficientOffset": 200, - "ReportingRateLimitNs": 1, - "TargetTimeFactor": 1.0, - "StaleTimeFactor": 5.0 - }, - { - "Name": "UiLowNoneBoost", - "PID_On": false, - "PID_Po": 0, - "PID_Pu": 0, - "PID_I": 0, - "PID_I_Init": 0, - "PID_I_High": 0, - "PID_I_Low": 0, - "PID_Do": 0, - "PID_Du": 0, - "SamplingWindow_P": 1, - "SamplingWindow_I": 1, - "SamplingWindow_D": 1, - "UclampMin_On": true, - "UclampMin_Init": 250, - "UclampMin_High": 0, - "UclampMin_Low": 0, - "UclampMax_EfficientBase": 500, - "UclampMax_EfficientOffset": 200, - "ReportingRateLimitNs": 1, - "TargetTimeFactor": 1.0, - "StaleTimeFactor": 5.0 } ] } From 6285144b08deeabeb52726bb8a72e2996c8335b5 Mon Sep 17 00:00:00 2001 From: guibing Date: Mon, 3 Feb 2025 19:24:06 +0000 Subject: [PATCH 5/7] ADPF:felix: use tagged ADPF profile for SYSTEM_UI. - Add a event node for SYSTEM_UI; - Add a separate SYSTEM_UI profile. Bug: 393196667 Test: adb shell dumpsys android.hardware.power.IPower/default Flag: NONE powerhal doesn't have a flag yet Change-Id: I92c5457480680d4a91058dd19bb12ae1fde8542e --- powerhint.json | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/powerhint.json b/powerhint.json index 72e8330..0088169 100644 --- a/powerhint.json +++ b/powerhint.json @@ -767,6 +767,16 @@ ], "ResetOnInit": true, "Type": "Property" + }, + { + "Name": "SYSTEM_UI_ADPF_PROFILES", + "Path": ":SYSTEM_UI", + "Values": [ + "SYSTEM_UI_PROFILE" + ], + "DefaultIndex": 0, + "ResetOnInit": true, + "Type": "Event" } ], "Actions": [ @@ -2424,6 +2434,42 @@ "JankCheckTimeFactor": 1.2, "LowFrameRateThreshold": 25, "MaxRecordsNum": 300 + }, + { + "Name": "SYSTEM_UI_PROFILE", + "PID_On": true, + "PID_Po": 2.0, + "PID_Pu": 1.0, + "PID_I": 0.0, + "PID_I_Init": 200, + "PID_I_High": 512, + "PID_I_Low": -30, + "PID_Do": 500.0, + "PID_Du": 0.0, + "UclampMin_On": true, + "UclampMin_Init": 232, + "UclampMin_LoadUp": 730, + "UclampMin_LoadReset": 730, + "UclampMin_High": 480, + "UclampMin_Low": 2, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, + "SamplingWindow_P": 1, + "SamplingWindow_I": 0, + "SamplingWindow_D": 1, + "ReportingRateLimitNs": 166666660, + "TargetTimeFactor": 1.0, + "StaleTimeFactor": 15.0, + "HeuristicBoost_On": true, + "HBoostModerateJankThreshold": 2, + "HBoostOffMaxAvgDurRatio": 4.0, + "HBoostSevereJankPidPu": 0.5, + "HBoostSevereJankThreshold": 8, + "HBoostUclampMinCeilingRange": [480, 722], + "HBoostUclampMinFloorRange": [230, 410], + "JankCheckTimeFactor": 1.2, + "LowFrameRateThreshold": 25, + "MaxRecordsNum": 300 } ] } From 6fad9b98e284316c6852145a57ccc809ef004a96 Mon Sep 17 00:00:00 2001 From: Barry Date: Fri, 31 Jan 2025 06:25:10 +0000 Subject: [PATCH 6/7] Enable BQR vendor snoop log Enable BQR vendor snoop log and enable enable Vendor Specific Quality event(s) Bug: 393491668 Test: Manual Test Flag: EXEMPT system prop update Change-Id: I353f2d1369da2c9e55afecfc306ea17cf66001e3 --- bluetooth/bt_vendor_overlay.conf | 2 +- device-felix.mk | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/bluetooth/bt_vendor_overlay.conf b/bluetooth/bt_vendor_overlay.conf index b7b419b..aab8da2 100644 --- a/bluetooth/bt_vendor_overlay.conf +++ b/bluetooth/bt_vendor_overlay.conf @@ -4,6 +4,6 @@ UartPort = /dev/ttySAC18 # Update BQR Event Mask property value -BqrEventMaskValueUpdate = 262238 +BqrEventMaskValueUpdate = 295006 BtOpusEnabled = true diff --git a/device-felix.mk b/device-felix.mk index 8d6c3b4..2f5a550 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -411,10 +411,16 @@ PRODUCT_PRODUCT_PROPERTIES += \ # Override BQR mask to enable LE Audio Choppy report ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) PRODUCT_PRODUCT_PROPERTIES += \ - persist.bluetooth.bqr.event_mask=262238 + persist.bluetooth.bqr.event_mask=295006 \ + persist.bluetooth.bqr.vnd_quality_mask=29 \ + persist.bluetooth.bqr.vnd_trace_mask=0 \ + persist.bluetooth.vendor.btsnoop=true else PRODUCT_PRODUCT_PROPERTIES += \ - persist.bluetooth.bqr.event_mask=94 + persist.bluetooth.bqr.event_mask=295006 \ + persist.bluetooth.bqr.vnd_quality_mask=16 \ + persist.bluetooth.bqr.vnd_trace_mask=0 \ + persist.bluetooth.vendor.btsnoop=false endif # Bluetooth LE Audio CIS handover to SCO From 6c8adcff9aab31fba4d2527f31919e4c24f7dbf8 Mon Sep 17 00:00:00 2001 From: Devin Moore Date: Wed, 5 Feb 2025 21:38:20 +0000 Subject: [PATCH 7/7] Remove old unused VINTF manifest file This file is out of date and unused, so remove it. It's targeting Android R FCM and declaring old HIDL versions of HALs that these devices do not use. Test: m Bug: 388074589 Change-Id: I516dd5bc80c44f0e44db3d93c5c0fa64f521ef6d --- aosp_felix.mk | 3 -- manifest.xml | 124 -------------------------------------------------- 2 files changed, 127 deletions(-) delete mode 100644 manifest.xml diff --git a/aosp_felix.mk b/aosp_felix.mk index 949a93a..7ed36e9 100644 --- a/aosp_felix.mk +++ b/aosp_felix.mk @@ -27,6 +27,3 @@ PRODUCT_DEVICE := felix PRODUCT_MODEL := AOSP on Felix PRODUCT_BRAND := Android PRODUCT_MANUFACTURER := Google - -DEVICE_MANIFEST_FILE := \ - device/google/felix/manifest.xml diff --git a/manifest.xml b/manifest.xml deleted file mode 100644 index a287416..0000000 --- a/manifest.xml +++ /dev/null @@ -1,124 +0,0 @@ - - - android.hardware.audio - hwbinder - 7.1 - - IDevicesFactory - default - - - - android.hardware.audio.effect - hwbinder - 7.0 - - IEffectsFactory - default - - - - android.hardware.soundtrigger - hwbinder - 2.3 - - ISoundTriggerHw - default - - - - android.hardware.media.omx - hwbinder - 1.0 - - IOmx - default - - - IOmxStore - default - - - - android.hardware.graphics.allocator - hwbinder - 4.0 - - IAllocator - default - - - - android.hardware.graphics.composer - hwbinder - 2.4 - - IComposer - default - - - - android.hardware.renderscript - passthrough - 1.0 - - IDevice - default - - - - android.hardware.dumpstate - hwbinder - 1.1 - - IDumpstateDevice - default - - - - android.hardware.bluetooth.audio - hwbinder - 2.1 - - IBluetoothAudioProvidersFactory - default - - - - android.hardware.boot - hwbinder - @1.2::IBootControl/default - - - android.hardware.neuralnetworks - hwbinder - @1.3::IDevice/google-edgetpu - - - android.hardware.health - hwbinder - 2.1 - - IHealth - default - - - - vendor.google.google_battery - 3 - - IGoogleBattery - default - - - - vendor.google.whitechapel.audio.audioext - hwbinder - 4.0 - - IAudioExt - default - - - -