Merge cherrypicks of ['googleplex-android-review.googlesource.com/27918671', 'googleplex-android-review.googlesource.com/27949359'] into 24Q3-release.

Change-Id: I532d710bb70779d95039e9c148652a5f035743d1
This commit is contained in:
Android Build Coastguard Worker 2024-06-26 03:12:22 +00:00
commit ab92d5d2cb
6 changed files with 4 additions and 26 deletions

View file

@ -33,13 +33,13 @@
<integer name="config_screenBrightnessDim">6</integer>
<!-- Default strength, in percentage, of bright color reduction when activated. -->
<integer name="config_reduceBrightColorsStrengthDefault">50</integer>
<integer name="config_reduceBrightColorsStrengthDefault">35</integer>
<!-- Minimum strength, in percentage, supported by bright color reduction. -->
<integer name="config_reduceBrightColorsStrengthMin">25</integer>
<!-- Maximum strength, in percentage, supported by bright color reduction. -->
<integer name="config_reduceBrightColorsStrengthMax">75</integer>
<integer name="config_reduceBrightColorsStrengthMax">50</integer>
<!-- Minimum screen brightness setting allowed by power manager.
The user is forbidden from setting the brightness below this level. -->

View file

@ -434,9 +434,3 @@ PRODUCT_COPY_FILES += \
PRODUCT_PRODUCT_PROPERTIES += \
persist.bluetooth.thread_dispatcher.enabled=true
# Thread HAL
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
PRODUCT_PACKAGES += \
com.google.caimito.hardware.threadnetwork
endif

View file

@ -435,9 +435,3 @@ PRODUCT_COPY_FILES += \
PRODUCT_PRODUCT_PROPERTIES += \
persist.bluetooth.thread_dispatcher.enabled=true
# Thread HAL
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
PRODUCT_PACKAGES += \
com.google.caimito.hardware.threadnetwork
endif

View file

@ -243,7 +243,3 @@ PRODUCT_VENDOR_PROPERTIES += \
# PKVM Memory Reclaim
PRODUCT_VENDOR_PROPERTIES += \
hypervisor.memory_reclaim.supported=1
# Thread HAL
PRODUCT_PACKAGES += \
com.google.caimito.hardware.threadnetwork

View file

@ -406,9 +406,3 @@ PRODUCT_COPY_FILES += \
PRODUCT_PRODUCT_PROPERTIES += \
persist.bluetooth.thread_dispatcher.enabled=true
# Thread HAL
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
PRODUCT_PACKAGES += \
com.google.caimito.hardware.threadnetwork
endif

View file

@ -33,13 +33,13 @@
<integer name="config_screenBrightnessDim">6</integer>
<!-- Default strength, in percentage, of bright color reduction when activated. -->
<integer name="config_reduceBrightColorsStrengthDefault">50</integer>
<integer name="config_reduceBrightColorsStrengthDefault">35</integer>
<!-- Minimum strength, in percentage, supported by bright color reduction. -->
<integer name="config_reduceBrightColorsStrengthMin">25</integer>
<!-- Maximum strength, in percentage, supported by bright color reduction. -->
<integer name="config_reduceBrightColorsStrengthMax">75</integer>
<integer name="config_reduceBrightColorsStrengthMax">50</integer>
<!-- Minimum screen brightness setting allowed by power manager.
The user is forbidden from setting the brightness below this level. -->