[LSC] Add LOCAL_LICENSE_KINDS to device/google/redfin am: 488ea9bd19 am: 508a78ac8c
Original change: https://android-review.googlesource.com/c/device/google/redfin/+/1636264
Change-Id: Ia45659397c94b7d91aee70b5ca4dfbcdc6db63f1
diff --git a/audio/cs35l41/B2/R-cs35l41-revB2-dsp1-spk-cali.bin b/audio/cs35l41/B2/R-cs35l41-revB2-dsp1-spk-cali.bin
index 52cd454..364e289 100644
--- a/audio/cs35l41/B2/R-cs35l41-revB2-dsp1-spk-cali.bin
+++ b/audio/cs35l41/B2/R-cs35l41-revB2-dsp1-spk-cali.bin
Binary files differ
diff --git a/audio/cs35l41/B2/R-cs35l41-revB2-dsp1-spk-prot.bin b/audio/cs35l41/B2/R-cs35l41-revB2-dsp1-spk-prot.bin
index e2d80ae..8288785 100644
--- a/audio/cs35l41/B2/R-cs35l41-revB2-dsp1-spk-prot.bin
+++ b/audio/cs35l41/B2/R-cs35l41-revB2-dsp1-spk-prot.bin
Binary files differ
diff --git a/audio/cs35l41/B2/cs35l41-revB2-dsp1-spk-cali.bin b/audio/cs35l41/B2/cs35l41-revB2-dsp1-spk-cali.bin
index 0e2b6ed..f3172aa 100644
--- a/audio/cs35l41/B2/cs35l41-revB2-dsp1-spk-cali.bin
+++ b/audio/cs35l41/B2/cs35l41-revB2-dsp1-spk-cali.bin
Binary files differ
diff --git a/audio/cs35l41/B2/cs35l41-revB2-dsp1-spk-cali.wmfw b/audio/cs35l41/B2/cs35l41-revB2-dsp1-spk-cali.wmfw
index 83dbe7e..07a10ad 100644
--- a/audio/cs35l41/B2/cs35l41-revB2-dsp1-spk-cali.wmfw
+++ b/audio/cs35l41/B2/cs35l41-revB2-dsp1-spk-cali.wmfw
Binary files differ
diff --git a/audio/cs35l41/B2/cs35l41-revB2-dsp1-spk-prot.bin b/audio/cs35l41/B2/cs35l41-revB2-dsp1-spk-prot.bin
index 2170b0d..54565da 100644
--- a/audio/cs35l41/B2/cs35l41-revB2-dsp1-spk-prot.bin
+++ b/audio/cs35l41/B2/cs35l41-revB2-dsp1-spk-prot.bin
Binary files differ
diff --git a/audio/cs35l41/B2/cs35l41-revB2-dsp1-spk-prot.wmfw b/audio/cs35l41/B2/cs35l41-revB2-dsp1-spk-prot.wmfw
index 83dbe7e..07a10ad 100644
--- a/audio/cs35l41/B2/cs35l41-revB2-dsp1-spk-prot.wmfw
+++ b/audio/cs35l41/B2/cs35l41-revB2-dsp1-spk-prot.wmfw
Binary files differ
diff --git a/audio/mixer_paths_noextcodec_snd.xml b/audio/mixer_paths_noextcodec_snd.xml
index 2725e50..36fb01b 100644
--- a/audio/mixer_paths_noextcodec_snd.xml
+++ b/audio/mixer_paths_noextcodec_snd.xml
@@ -2046,10 +2046,6 @@
<ctl name="Voice Sidetone Enable" value="1" />
</path>
- <path name="speaker-mic">
- <path name="speaker-dmic-endfire" />
- </path>
-
<path name="speaker-mic-liquid">
<path name="dmic5" />
</path>
@@ -2204,10 +2200,6 @@
<path name="speaker-vbat-mono-2" />
</path>
- <path name="voice-speaker-mic">
- <path name="speaker-mic" />
- </path>
-
<path name="voice-headphones">
<path name="headphones" />
</path>
@@ -2420,6 +2412,14 @@
<path name="handset-dmic-endfire" />
</path>
+ <path name="speaker-mic">
+ <path name="speaker-dmic-endfire" />
+ </path>
+
+ <path name="voice-speaker-mic">
+ <path name="speaker-mic" />
+ </path>
+
<path name="speaker-stereo-dmic-ef-liquid">
<path name="speaker-dmic-endfire" />
</path>
diff --git a/device-redfin.mk b/device-redfin.mk
index de95157..4b46b63 100644
--- a/device-redfin.mk
+++ b/device-redfin.mk
@@ -184,8 +184,8 @@
endif
# GPS ANTENNA_INFO configuration file
-PRODUCT_COPY_FILES += \
- $(LOCAL_PATH)/gnss_antenna_info.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss_antenna_info.conf
+#PRODUCT_COPY_FILES += \
+# $(LOCAL_PATH)/gnss_antenna_info.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss_antenna_info.conf
# Audio effects
PRODUCT_PACKAGES += \
diff --git a/redfin/overlay/frameworks/base/core/res/res/values/config.xml b/redfin/overlay/frameworks/base/core/res/res/values/config.xml
index bad2fae..3aa7584 100755
--- a/redfin/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/redfin/overlay/frameworks/base/core/res/res/values/config.xml
@@ -235,6 +235,19 @@
<!-- default refresh rate in the zone defined by birghtness and ambient thresholds -->
<integer name="config_defaultRefreshRateInZone">90</integer>
+ <!-- Switch to fixed refresh rate when display brightness setting is
+ equal or more than this value -->
+ <integer-array name="config_highDisplayBrightnessThresholdsOfFixedRefreshRate">
+ <item>255</item> <!-- 100% UI brightness -->
+ </integer-array>
+
+ <integer-array name="config_highAmbientBrightnessThresholdsOfFixedRefreshRate">
+ <item>50000</item>
+ </integer-array>
+
+ <!-- default refresh rate in the high zone defined by birghtness and ambient thresholds -->
+ <integer name="config_fixedRefreshRateInHighZone">60</integer>
+
<!-- List of biometric sensors on the device, in decreasing strength. Consumed by AuthService
when registering authenticators with BiometricService. Format must be ID:Modality:Strength,
where: IDs are unique per device, Modality as defined in BiometricAuthenticator.java,
