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/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 502a614..2958524 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
@@ -443,6 +449,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
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
-
-
-
-
diff --git a/powerhint.json b/powerhint.json
index a827cdb..0088169 100644
--- a/powerhint.json
+++ b/powerhint.json
@@ -757,6 +757,26 @@
],
"DefaultIndex": 0,
"ResetOnInit": true
+ },
+ {
+ "Name": "AAModeProperty",
+ "Path": "vendor.powerhal.mode.aa",
+ "Values": [
+ "1",
+ "0"
+ ],
+ "ResetOnInit": true,
+ "Type": "Property"
+ },
+ {
+ "Name": "SYSTEM_UI_ADPF_PROFILES",
+ "Path": ":SYSTEM_UI",
+ "Values": [
+ "SYSTEM_UI_PROFILE"
+ ],
+ "DefaultIndex": 0,
+ "ResetOnInit": true,
+ "Type": "Event"
}
],
"Actions": [
@@ -2054,6 +2074,12 @@
"Duration": 0,
"Value": "1"
},
+ {
+ "PowerHint": "AUTOMOTIVE_PROJECTION",
+ "Node": "AAModeProperty",
+ "Duration": 0,
+ "Value": "1"
+ },
{
"PowerHint": "DISPLAY_IDLE",
"Node": "FGPreferIdle",
@@ -2071,6 +2097,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",
@@ -2398,76 +2436,40 @@
"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,
+ "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": 250,
- "UclampMin_High": 197,
- "UclampMin_Low": 197,
+ "UclampMin_Init": 232,
+ "UclampMin_LoadUp": 730,
+ "UclampMin_LoadReset": 730,
+ "UclampMin_High": 480,
+ "UclampMin_Low": 2,
"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_I": 0,
"SamplingWindow_D": 1,
- "UclampMin_On": true,
- "UclampMin_Init": 250,
- "UclampMin_High": 53,
- "UclampMin_Low": 53,
- "UclampMax_EfficientBase": 500,
- "UclampMax_EfficientOffset": 200,
- "ReportingRateLimitNs": 1,
+ "ReportingRateLimitNs": 166666660,
"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
+ "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
}
]
}
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 \