Switch makefile owners to MK_OWNERS am: 46ea9b3a35 am: 0811a1be0b
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/3107246
Change-Id: I416c758e094922eb83867b1f5ccc618407bd74a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/audio/bluejay/config/audio_policy_configuration.xml b/audio/bluejay/config/audio_policy_configuration.xml
index 266bf4e..3463cf3 100644
--- a/audio/bluejay/config/audio_policy_configuration.xml
+++ b/audio/bluejay/config/audio_policy_configuration.xml
@@ -131,10 +131,6 @@
</devicePort>
<devicePort tagName="Speaker Safe" type="AUDIO_DEVICE_OUT_SPEAKER_SAFE" role="sink">
</devicePort>
- <devicePort tagName="Wired Headset" type="AUDIO_DEVICE_OUT_WIRED_HEADSET" role="sink">
- </devicePort>
- <devicePort tagName="Wired Headphones" type="AUDIO_DEVICE_OUT_WIRED_HEADPHONE" role="sink">
- </devicePort>
<devicePort tagName="BT SCO" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO" role="sink">
</devicePort>
<devicePort tagName="BT SCO Headset" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET" role="sink">
@@ -145,8 +141,6 @@
</devicePort>
<devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink">
</devicePort>
- <devicePort tagName="Aux Digital" type="AUDIO_DEVICE_OUT_AUX_DIGITAL" role="sink">
- </devicePort>
<devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink">
</devicePort>
<!-- Input devices declaration, i.e. Source DEVICE PORT -->
@@ -154,8 +148,6 @@
</devicePort>
<devicePort tagName="Built-In Back Mic" type="AUDIO_DEVICE_IN_BACK_MIC" role="source">
</devicePort>
- <devicePort tagName="Wired Headset Mic" type="AUDIO_DEVICE_IN_WIRED_HEADSET" role="source">
- </devicePort>
<devicePort tagName="BT SCO Headset Mic" type="AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET" role="source">
</devicePort>
<devicePort tagName="BT A2DP Out" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP" role="sink"
diff --git a/audio/bluejay/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/bluejay/config/audio_policy_configuration_a2dp_offload_disabled.xml
index 84869ab..4de4ec1 100644
--- a/audio/bluejay/config/audio_policy_configuration_a2dp_offload_disabled.xml
+++ b/audio/bluejay/config/audio_policy_configuration_a2dp_offload_disabled.xml
@@ -131,10 +131,6 @@
</devicePort>
<devicePort tagName="Speaker Safe" type="AUDIO_DEVICE_OUT_SPEAKER_SAFE" role="sink">
</devicePort>
- <devicePort tagName="Wired Headset" type="AUDIO_DEVICE_OUT_WIRED_HEADSET" role="sink">
- </devicePort>
- <devicePort tagName="Wired Headphones" type="AUDIO_DEVICE_OUT_WIRED_HEADPHONE" role="sink">
- </devicePort>
<devicePort tagName="BT SCO" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO" role="sink">
</devicePort>
<devicePort tagName="BT SCO Headset" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET" role="sink">
@@ -145,8 +141,6 @@
</devicePort>
<devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink">
</devicePort>
- <devicePort tagName="Aux Digital" type="AUDIO_DEVICE_OUT_AUX_DIGITAL" role="sink">
- </devicePort>
<devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink">
</devicePort>
<!-- Input devices declaration, i.e. Source DEVICE PORT -->
@@ -154,8 +148,6 @@
</devicePort>
<devicePort tagName="Built-In Back Mic" type="AUDIO_DEVICE_IN_BACK_MIC" role="source">
</devicePort>
- <devicePort tagName="Wired Headset Mic" type="AUDIO_DEVICE_IN_WIRED_HEADSET" role="source">
- </devicePort>
<devicePort tagName="BT SCO Headset Mic" type="AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET" role="source">
</devicePort>
<devicePort tagName="USB Device In" type="AUDIO_DEVICE_IN_USB_DEVICE" role="source">
diff --git a/audio/bluejay/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/bluejay/config/audio_policy_configuration_bluetooth_legacy_hal.xml
index c2e949e..2a64248 100644
--- a/audio/bluejay/config/audio_policy_configuration_bluetooth_legacy_hal.xml
+++ b/audio/bluejay/config/audio_policy_configuration_bluetooth_legacy_hal.xml
@@ -131,10 +131,6 @@
</devicePort>
<devicePort tagName="Speaker Safe" type="AUDIO_DEVICE_OUT_SPEAKER_SAFE" role="sink">
</devicePort>
- <devicePort tagName="Wired Headset" type="AUDIO_DEVICE_OUT_WIRED_HEADSET" role="sink">
- </devicePort>
- <devicePort tagName="Wired Headphones" type="AUDIO_DEVICE_OUT_WIRED_HEADPHONE" role="sink">
- </devicePort>
<devicePort tagName="BT SCO" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO" role="sink">
</devicePort>
<devicePort tagName="BT SCO Headset" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET" role="sink">
@@ -145,8 +141,6 @@
</devicePort>
<devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink">
</devicePort>
- <devicePort tagName="Aux Digital" type="AUDIO_DEVICE_OUT_AUX_DIGITAL" role="sink">
- </devicePort>
<devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink">
</devicePort>
<!-- Input devices declaration, i.e. Source DEVICE PORT -->
@@ -154,8 +148,6 @@
</devicePort>
<devicePort tagName="Built-In Back Mic" type="AUDIO_DEVICE_IN_BACK_MIC" role="source">
</devicePort>
- <devicePort tagName="Wired Headset Mic" type="AUDIO_DEVICE_IN_WIRED_HEADSET" role="source">
- </devicePort>
<devicePort tagName="BT SCO Headset Mic" type="AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET" role="source">
</devicePort>
<devicePort tagName="USB Device In" type="AUDIO_DEVICE_IN_USB_DEVICE" role="source">
diff --git a/bluejay/BoardConfig.mk b/bluejay/BoardConfig.mk
index 94dea6a..6496ad0 100644
--- a/bluejay/BoardConfig.mk
+++ b/bluejay/BoardConfig.mk
@@ -21,18 +21,15 @@
endif
RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_BLUEJAY_RADIO_DIR)
-ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
-RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1
-else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
-RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2
-else
-RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk
-endif
+RELEASE_GOOGLE_BOOTLOADER_BLUEJAY_DIR ?= pdk# Keep this for pdk TODO: b/327119000
+RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_BLUEJAY_DIR)
+$(call soong_config_set,bluejay_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_BLUEJAY_DIR))
# Enable load module in parallel
BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true
# The modules which need to be loaded in sequential
+BOARD_KERNEL_CMDLINE += fips140.load_sequential=1
BOARD_KERNEL_CMDLINE += exynos_mfc.load_sequential=1
BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1
BOARD_KERNEL_CMDLINE += pcie-exynos-core.load_sequential=1
diff --git a/device-bluejay.mk b/device-bluejay.mk
index df40e0d..2636f8d 100644
--- a/device-bluejay.mk
+++ b/device-bluejay.mk
@@ -17,17 +17,10 @@
# 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/bluejay-kernel
-TARGET_BOARD_KERNEL_HEADERS := device/google/bluejay-kernel/kernel-headers
-
-ifdef RELEASE_GOOGLE_BLUEJAY_KERNEL_VERSION
-TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_BLUEJAY_KERNEL_VERSION)
-endif
-
-ifdef RELEASE_GOOGLE_BLUEJAY_KERNEL_DIR
-TARGET_KERNEL_DIR := $(RELEASE_GOOGLE_BLUEJAY_KERNEL_DIR)
-TARGET_BOARD_KERNEL_HEADERS := $(RELEASE_GOOGLE_BLUEJAY_KERNEL_DIR)/kernel-headers
-endif
+TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_BLUEJAY_VERSION)
+# Keeps flexibility for kasan and ufs builds
+TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_BLUEJAY_DIR)
+TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_BLUEJAY_DIR)/kernel-headers
$(call inherit-product-if-exists, vendor/google_devices/bluejay/prebuilts/device-vendor-bluejay.mk)
$(call inherit-product-if-exists, vendor/google_devices/gs101/prebuilts/device-vendor.mk)
@@ -49,13 +42,6 @@
# Fingerprint HAL
GOODIX_CONFIG_BUILD_VERSION := g7_trusty
-ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
-PRODUCT_SOONG_NAMESPACES += vendor/google_devices/bluejay/prebuilts/firmware/fingerprint/24Q1
-else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
-PRODUCT_SOONG_NAMESPACES += vendor/google_devices/bluejay/prebuilts/firmware/fingerprint/24Q2
-else
-PRODUCT_SOONG_NAMESPACES += vendor/google_devices/bluejay/prebuilts/firmware/fingerprint/trunk
-endif
$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_common.mk)
ifeq ($(filter factory%, $(TARGET_PRODUCT)),)
$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_shipping.mk)
@@ -144,7 +130,7 @@
# Increment the SVN for any official public releases
PRODUCT_VENDOR_PROPERTIES += \
- ro.vendor.build.svn=57
+ ro.vendor.build.svn=62
# DCK properties based on target
PRODUCT_PROPERTY_OVERRIDES += \
@@ -153,13 +139,6 @@
# Trusty liboemcrypto.so
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/bluejay/prebuilts
-ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
-PRODUCT_SOONG_NAMESPACES += vendor/google_devices/bluejay/prebuilts/trusty/24Q1
-else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
-PRODUCT_SOONG_NAMESPACES += vendor/google_devices/bluejay/prebuilts/trusty/24Q2
-else
-PRODUCT_SOONG_NAMESPACES += vendor/google_devices/bluejay/prebuilts/trusty/trunk
-endif
# Display
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.lbe.supported=1
@@ -186,7 +165,8 @@
# Bluetooth
PRODUCT_PRODUCT_PROPERTIES += \
persist.bluetooth.a2dp_aac.vbr_supported=true \
- persist.bluetooth.firmware.selection=BCM.hcd
+ persist.bluetooth.firmware.selection=BCM.hcd \
+ bluetooth.server.automatic_turn_on=true
# Set zram size
PRODUCT_VENDOR_PROPERTIES += \
@@ -250,6 +230,7 @@
PRODUCT_SHIPPING_API_LEVEL := 32
# Vibrator HAL
+$(call soong_config_set,haptics,kernel_ver,v$(subst .,_,$(TARGET_LINUX_KERNEL_VERSION)))
ADAPTIVE_HAPTICS_FEATURE := adaptive_haptics_v1
PRODUCT_VENDOR_PROPERTIES += \
ro.vendor.vibrator.hal.supported_primitives=243 \
diff --git a/gps.xml.b3 b/gps.xml.b3
index fd10075..9ee4e24 100644
--- a/gps.xml.b3
+++ b/gps.xml.b3
@@ -68,7 +68,7 @@
<gll
PpsEnable="true"
LogPriMask="LOG_INFO"
- LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI | LOG_MEASAPI"
+ LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
MultiCarrRFMode="GL_MULTI_CARR_RF_MODE_L1"
MultiCarrLnaMask="L1_EXT_ON"
diff --git a/powerhint.json b/powerhint.json
index 6dc9ebc..b2d3388 100644
--- a/powerhint.json
+++ b/powerhint.json
@@ -1833,16 +1833,27 @@
"PID_Du": 0.0,
"UclampMin_On": true,
"UclampMin_Init": 232,
+ "UclampMin_LoadUp": 480,
+ "UclampMin_LoadReset": 480,
"UclampMin_High": 480,
"UclampMin_Low": 2,
+ "UclampMax_EfficientBase": 400,
+ "UclampMax_EfficientOffset": 200,
"SamplingWindow_P": 1,
"SamplingWindow_I": 0,
"SamplingWindow_D": 1,
"ReportingRateLimitNs": 83333330,
- "EarlyBoost_On": false,
- "EarlyBoost_TimeFactor": 0.0,
"TargetTimeFactor": 1.0,
- "StaleTimeFactor": 15.0
+ "StaleTimeFactor": 15.0,
+ "HeuristicBoost_On": true,
+ "HBoostOnMissedCycles": 8,
+ "HBoostOffMaxAvgRatio": 4.0,
+ "HBoostOffMissedCycles": 5,
+ "HBoostPidPuFactor": 0.5,
+ "HBoostUclampMin": 722,
+ "JankCheckTimeFactor": 1.2,
+ "LowFrameRateThreshold": 25,
+ "MaxRecordsNum": 300
},
{
"Name": "REFRESH_90FPS",
@@ -1857,16 +1868,27 @@
"PID_Du": 0.0,
"UclampMin_On": true,
"UclampMin_Init": 162,
+ "UclampMin_LoadUp": 480,
+ "UclampMin_LoadReset": 480,
"UclampMin_High": 480,
"UclampMin_Low": 2,
+ "UclampMax_EfficientBase": 400,
+ "UclampMax_EfficientOffset": 200,
"SamplingWindow_P": 1,
"SamplingWindow_I": 0,
"SamplingWindow_D": 1,
"ReportingRateLimitNs": 111111110,
- "EarlyBoost_On": false,
- "EarlyBoost_TimeFactor": 0.0,
"TargetTimeFactor": 1.0,
- "StaleTimeFactor": 15.0
+ "StaleTimeFactor": 15.0,
+ "HeuristicBoost_On": true,
+ "HBoostOnMissedCycles": 8,
+ "HBoostOffMaxAvgRatio": 4.0,
+ "HBoostOffMissedCycles": 5,
+ "HBoostPidPuFactor": 0.5,
+ "HBoostUclampMin": 722,
+ "JankCheckTimeFactor": 1.2,
+ "LowFrameRateThreshold": 25,
+ "MaxRecordsNum": 300
},
{
"Name": "REFRESH_60FPS",
@@ -1881,16 +1903,27 @@
"PID_Du": 0.0,
"UclampMin_On": true,
"UclampMin_Init": 162,
+ "UclampMin_LoadUp": 480,
+ "UclampMin_LoadReset": 480,
"UclampMin_High": 480,
"UclampMin_Low": 2,
+ "UclampMax_EfficientBase": 400,
+ "UclampMax_EfficientOffset": 200,
"SamplingWindow_P": 1,
"SamplingWindow_I": 0,
"SamplingWindow_D": 1,
"ReportingRateLimitNs": 166666660,
- "EarlyBoost_On": false,
- "EarlyBoost_TimeFactor": 0.0,
"TargetTimeFactor": 1.0,
- "StaleTimeFactor": 15.0
+ "StaleTimeFactor": 15.0,
+ "HeuristicBoost_On": true,
+ "HBoostOnMissedCycles": 8,
+ "HBoostOffMaxAvgRatio": 4.0,
+ "HBoostOffMissedCycles": 5,
+ "HBoostPidPuFactor": 0.5,
+ "HBoostUclampMin": 722,
+ "JankCheckTimeFactor": 1.2,
+ "LowFrameRateThreshold": 25,
+ "MaxRecordsNum": 300
},
{
"Name": "UiHighBoostWithoutPid",
@@ -1910,9 +1943,9 @@
"UclampMin_Init": 250,
"UclampMin_High": 197,
"UclampMin_Low": 197,
+ "UclampMax_EfficientBase": 400,
+ "UclampMax_EfficientOffset": 200,
"ReportingRateLimitNs": 1,
- "EarlyBoost_On": false,
- "EarlyBoost_TimeFactor": 0.0,
"TargetTimeFactor": 1.0,
"StaleTimeFactor": 5.0
},
@@ -1934,9 +1967,9 @@
"UclampMin_Init": 250,
"UclampMin_High": 53,
"UclampMin_Low": 53,
+ "UclampMax_EfficientBase": 400,
+ "UclampMax_EfficientOffset": 200,
"ReportingRateLimitNs": 1,
- "EarlyBoost_On": false,
- "EarlyBoost_TimeFactor": 0.0,
"TargetTimeFactor": 1.0,
"StaleTimeFactor": 5.0
},
@@ -1958,9 +1991,9 @@
"UclampMin_Init": 250,
"UclampMin_High": 0,
"UclampMin_Low": 0,
+ "UclampMax_EfficientBase": 400,
+ "UclampMax_EfficientOffset": 200,
"ReportingRateLimitNs": 1,
- "EarlyBoost_On": false,
- "EarlyBoost_TimeFactor": 0.0,
"TargetTimeFactor": 1.0,
"StaleTimeFactor": 5.0
}
diff --git a/thermal_info_config_bluejay.json b/thermal_info_config_bluejay.json
index a8a1166..17b0eb0 100644
--- a/thermal_info_config_bluejay.json
+++ b/thermal_info_config_bluejay.json
@@ -960,106 +960,6 @@
"Hidden":true
},
{
- "Name":"soft_ocp_cpu2",
- "Type":"BCL_CURRENT",
- "HotThreshold":[
- "NAN",
- "NAN",
- "NAN",
- "NAN",
- 9000,
- "NAN",
- "NAN"
- ],
- "HotHysteresis":[
- 0.0,
- 0.0,
- 0.0,
- 0.0,
- 100,
- 0.0,
- 0.0
- ],
- "VrThreshold":"NAN",
- "Multiplier":1,
- "Hidden":true
- },
- {
- "Name":"soft_ocp_cpu1",
- "Type":"BCL_CURRENT",
- "HotThreshold":[
- "NAN",
- "NAN",
- "NAN",
- "NAN",
- 7000,
- "NAN",
- "NAN"
- ],
- "HotHysteresis":[
- 0.0,
- 0.0,
- 0.0,
- 0.0,
- 100,
- 0.0,
- 0.0
- ],
- "VrThreshold":"NAN",
- "Multiplier":1,
- "Hidden":true
- },
- {
- "Name":"soft_ocp_tpu",
- "Type":"BCL_CURRENT",
- "HotThreshold":[
- "NAN",
- "NAN",
- "NAN",
- "NAN",
- 8500,
- "NAN",
- "NAN"
- ],
- "HotHysteresis":[
- 0.0,
- 0.0,
- 0.0,
- 0.0,
- 100,
- 0.0,
- 0.0
- ],
- "VrThreshold":"NAN",
- "Multiplier":1,
- "Hidden":true
- },
- {
- "Name":"soft_ocp_gpu",
- "Type":"BCL_CURRENT",
- "HotThreshold":[
- "NAN",
- "NAN",
- "NAN",
- "NAN",
- 9000,
- "NAN",
- "NAN"
- ],
- "HotHysteresis":[
- 0.0,
- 0.0,
- 0.0,
- 0.0,
- 100,
- 0.0,
- 0.0
- ],
- "VrThreshold":"NAN",
- "Multiplier":1,
- "Hidden":true
- },
- {
"Name":"TPU",
"Type":"NPU",
"HotThreshold":[
