Snap for 11816224 from 8e91379258 to 25D4-release

Change-Id: Ib4bf03e0064dbbe046c6be20bc0e9da884c2db22
This commit is contained in:
Android Build Coastguard Worker 2024-05-08 23:03:57 +00:00
commit 1f30502713
2 changed files with 22 additions and 90 deletions

View file

@ -14,8 +14,24 @@
# limitations under the License. # limitations under the License.
# #
TARGET_KERNEL_DIR ?= device/google/tegu-kernel ifdef RELEASE_GOOGLE_TEGU_RADIO_DIR
TARGET_BOARD_KERNEL_HEADERS := device/google/tegu-kernel/kernel-headers RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_TEGU_RADIO_DIR)
endif
ifdef RELEASE_GOOGLE_TEGU_RADIOCFG_DIR
RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR := $(RELEASE_GOOGLE_TEGU_RADIOCFG_DIR)
endif
RELEASE_GOOGLE_BOOTLOADER_TEGU_DIR ?= 25D4# Keep this for pdk TODO: b/327119000
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_TEGU_DIR)
$(call soong_config_set,tegu_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_TEGU_DIR))
ifdef RELEASE_GOOGLE_TEGU_KERNEL_DIR
TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_TEGU_KERNEL_DIR)
TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_TEGU_KERNEL_DIR)/kernel-headers
else
TARGET_KERNEL_DIR ?= device/google/tegu-kernels/6.1/25D4
TARGET_BOARD_KERNEL_HEADERS ?= device/google/tegu-kernels/6.1/25D4/kernel-headers
endif
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
USE_UWBFIELDTESTQM := true USE_UWBFIELDTESTQM := true

View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- <!--
/* /*
** Copyright 2021, The Android Open Source Project ** Copyright 2023, The Android Open Source Project
** **
** Licensed under the Apache License, Version 2.0 (the "License"); ** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License. ** you may not use this file except in compliance with the License.
@ -42,8 +42,8 @@
<!-- Default screen brightness setting <!-- Default screen brightness setting
Must be in the range specified by minimum and maximum. --> Must be in the range specified by minimum and maximum. -->
<!-- 140 nits: (140-2)/(1250-2)*(0.68-0.0)+0.0 = 0.075192308 --> <!-- 140 nits: (140-2)/(1200-2)*(0.67-0.0)+0.0 = 0.077178631 -->
<item name="config_screenBrightnessSettingDefaultFloat" format="float" type="dimen">0.075192308</item> <item name="config_screenBrightnessSettingDefaultFloat" format="float" type="dimen">0.077178631</item>
<!-- The default refresh rate. Pixel 6 manages this using the peak refresh rate setting, so set <!-- The default refresh rate. Pixel 6 manages this using the peak refresh rate setting, so set
this value to 0 so it has no effect. --> this value to 0 so it has no effect. -->
@ -67,97 +67,13 @@
<!-- Default refresh rate while the device has high brightness mode enabled for HDR. --> <!-- Default refresh rate while the device has high brightness mode enabled for HDR. -->
<integer name="config_defaultRefreshRateInHbmHdr">60</integer> <integer name="config_defaultRefreshRateInHbmHdr">60</integer>
<!-- Array of light sensor LUX values to define our levels for auto backlight brightness support.
The N entries of this array define N 1 zones as follows:
Zone 0: 0 <= LUX < array[0]
Zone 1: array[0] <= LUX < array[1]
...
Zone N: array[N - 1] <= LUX < array[N]
Zone N + 1 array[N] <= LUX < infinity
Must be overridden in platform specific overlays -->
<integer-array name="config_autoBrightnessLevels">
<item>1</item>
<item>2</item>
<item>3</item>
<item>4</item>
<item>8</item>
<item>12</item>
<item>15</item>
<item>20</item>
<item>33</item>
<item>55</item>
<item>90</item>
<item>148</item>
<item>245</item>
<item>403</item>
<item>665</item>
<item>1097</item>
<item>1808</item>
<item>3000</item>
<item>6000</item>
<item>9000</item>
<item>10000</item>
<item>14000</item>
<item>20000</item>
<item>25000</item>
<item>31000</item>
<item>51000</item>
<item>81000</item>
<item>100000</item>
</integer-array>
<!-- Array of desired screen brightness in nits corresponding to the lux values
in the config_autoBrightnessLevels array. As with config_screenBrightnessMinimumNits and
config_screenBrightnessMaximumNits, the display brightness is defined as the measured
brightness of an all-white image.
If this is defined then:
- config_autoBrightnessLcdBacklightValues should not be defined
- config_screenBrightnessNits must be defined
- config_screenBrightnessBacklight must be defined
This array should have size one greater than the size of the config_autoBrightnessLevels
array. The brightness values must be non-negative and non-decreasing. This must be
overridden in platform specific overlays -->
<array name="config_autoBrightnessDisplayValuesNits">
<item>5.139055</item> <!-- 0 - 1 -->
<item>9.962018965</item> <!-- 1 - 2 -->
<item>18.34822964</item> <!-- 2 - 3 -->
<item>21.55068128</item> <!-- 3 - 4 -->
<item>24.0167788</item> <!-- 4 - 8 -->
<item>32.5</item> <!-- 8 - 12 -->
<item>46</item> <!-- 12 - 15 -->
<item>53.26923077</item> <!-- 15 - 20 -->
<item>54.61538462</item> <!-- 20 - 33 -->
<item>58.11538462</item> <!-- 33 - 55 -->
<item>62.1394</item> <!-- 55 - 90 -->
<item>67.13133333</item> <!-- 90 - 148 -->
<item>79.67614115</item> <!-- 148 - 245 -->
<item>98.04727274</item> <!-- 245 - 403 -->
<item>125.1221991</item> <!-- 403 - 665 -->
<item>161.6875093</item> <!-- 665 - 1097 -->
<item>208.4885553</item> <!-- 1097 - 1808 -->
<item>264.8221315</item> <!-- 1808 - 3000 -->
<item>328.5869521</item> <!-- 3000 - 6000 -->
<item>627.4315413</item> <!-- 6000 - 9000 -->
<item>826.8584866</item> <!-- 9000 - 10000 -->
<item>867.85582302</item> <!-- 10000 - 14000 -->
<item>1041.39662279</item> <!-- 14000 - 20000 -->
<item>1227.52633489</item> <!-- 20000 - 25000 -->
<item>1331.28933608</item> <!-- 25000 - 31000 -->
<item>1414.57566867</item> <!-- 31000 - 51000 -->
<item>1553.22826182</item> <!-- 51000 - 81000 -->
<item>1614.01031782</item> <!-- 81000 - 100000 -->
<item>1850</item> <!-- 100000+ -->
</array>
<!-- Stability requirements in milliseconds for accepting a new brightness level. This is used <!-- Stability requirements in milliseconds for accepting a new brightness level. This is used
for debouncing the light sensor. Different constants are used to debounce the light sensor for debouncing the light sensor. Different constants are used to debounce the light sensor
when adapting to brighter or darker environments. This parameter controls how quickly when adapting to brighter or darker environments. This parameter controls how quickly
brightness changes occur in response to an observed change in light level that exceeds the brightness changes occur in response to an observed change in light level that exceeds the
hysteresis threshold. --> hysteresis threshold. -->
<integer name="config_autoBrightnessBrighteningLightDebounce">1000</integer> <integer name="config_autoBrightnessBrighteningLightDebounce">1000</integer>
<integer name="config_autoBrightnessDarkeningLightDebounce">4000</integer> <integer name="config_autoBrightnessDarkeningLightDebounce">2000</integer>
<integer-array name="config_ambientThresholdLevels"> <integer-array name="config_ambientThresholdLevels">
<item>2</item> <item>2</item>