Snap for 8680211 from eda824de6d3aa3506312934c657a9bf481880d4f to mainline-go-adservices-releaseaml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000android13-mainline-go-adservices-release

Change-Id: Id328b18922d83bc074a5315f084ad33cfd811370

5 files changed, 20 insertions, 28 deletions

diff --git a/audio/bluejay/config/audio_policy_configuration.xml b/audio/bluejay/config/audio_policy_configuration.xml
index 4a612af..d07b023 100644
--- a/audio/bluejay/config/audio_policy_configuration.xml
+++ b/audio/bluejay/config/audio_policy_configuration.xml
@@ -27,7 +27,8 @@
             </attachedDevices>
             <defaultOutputDevice>Speaker</defaultOutputDevice>
             <mixPorts>
-                <mixPort name="primary output" role="source" flags="AUDIO_OUTPUT_FLAG_PRIMARY AUDIO_OUTPUT_FLAG_FAST">
+                <mixPort name="primary output" role="source" flags="AUDIO_OUTPUT_FLAG_PRIMARY AUDIO_OUTPUT_FLAG_FAST"
+                         recommendedMuteDurationMs="40">
                     <profile name="" format="AUDIO_FORMAT_PCM_FLOAT"
                              samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </mixPort>
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 a7dd45f..54ed107 100644
--- a/audio/bluejay/config/audio_policy_configuration_a2dp_offload_disabled.xml
+++ b/audio/bluejay/config/audio_policy_configuration_a2dp_offload_disabled.xml
@@ -27,7 +27,8 @@
             </attachedDevices>
             <defaultOutputDevice>Speaker</defaultOutputDevice>
             <mixPorts>
-                <mixPort name="primary output" role="source" flags="AUDIO_OUTPUT_FLAG_PRIMARY AUDIO_OUTPUT_FLAG_FAST">
+                <mixPort name="primary output" role="source" flags="AUDIO_OUTPUT_FLAG_PRIMARY AUDIO_OUTPUT_FLAG_FAST"
+                         recommendedMuteDurationMs="40">
                     <profile name="" format="AUDIO_FORMAT_PCM_FLOAT"
                              samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </mixPort>
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 094d21f..9bcfa5f 100644
--- a/audio/bluejay/config/audio_policy_configuration_bluetooth_legacy_hal.xml
+++ b/audio/bluejay/config/audio_policy_configuration_bluetooth_legacy_hal.xml
@@ -27,7 +27,8 @@
             </attachedDevices>
             <defaultOutputDevice>Speaker</defaultOutputDevice>
             <mixPorts>
-                <mixPort name="primary output" role="source" flags="AUDIO_OUTPUT_FLAG_PRIMARY AUDIO_OUTPUT_FLAG_FAST">
+                <mixPort name="primary output" role="source" flags="AUDIO_OUTPUT_FLAG_PRIMARY AUDIO_OUTPUT_FLAG_FAST"
+                         recommendedMuteDurationMs="40">
                     <profile name="" format="AUDIO_FORMAT_PCM_FLOAT"
                              samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </mixPort>
diff --git a/device-bluejay.mk b/device-bluejay.mk
index b918d11..3ec3b69 100644
--- a/device-bluejay.mk
+++ b/device-bluejay.mk
@@ -119,7 +119,7 @@ PRODUCT_SOONG_NAMESPACES += \
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=3
+    ro.vendor.build.svn=5
 
 # DCK properties based on target
 PRODUCT_PROPERTY_OVERRIDES += \
@@ -178,6 +178,10 @@ PRODUCT_VENDOR_PROPERTIES += \
     persist.vendor.udfps.als_feed_forward_supported=true \
     persist.vendor.udfps.lhbm_controlled_in_hal_supported=true
 
+# Fingerprint MAX auth latency
+PRODUCT_VENDOR_PROPERTIES += \
+    vendor.gf.debug.timer.threshold=1,400,400,400,600,600,600
+
 # Hide cutout overlays
 PRODUCT_PACKAGES += \
     NoCutoutOverlay \
diff --git a/powerhint.json b/powerhint.json
index d1248bb..c28665e 100644
--- a/powerhint.json
+++ b/powerhint.json
@@ -251,15 +251,6 @@
       "ResetOnInit": true
     },
     {
-      "Name": "F2fsRecessModeEnable",
-      "Path": "/dev/sys/fs/by-name/userdata/gc_urgent",
-      "Values": [
-        "2",
-        "0"
-      ],
-      "ResetOnInit": true
-    },
-    {
       "Name": "TAPreferHighCap",
       "Path": "/proc/vendor_sched/ta_prefer_high_cap",
       "Values": [
@@ -492,12 +483,6 @@
       "Value": "85"
     },
     {
-      "PowerHint": "DEVICE_IDLE",
-      "Node": "F2fsRecessModeEnable",
-      "Duration": 0,
-      "Value": "2"
-    },
-    {
       "PowerHint": "LAUNCH",
       "Node": "UClampThreshold",
       "Duration": 5000,
@@ -570,12 +555,6 @@
       "Value": "0"
     },
     {
-      "PowerHint": "DISPLAY_INACTIVE",
-      "Node": "F2fsRecessModeEnable",
-      "Duration": 0,
-      "Value": "2"
-    },
-    {
       "PowerHint": "CAMERA_LAUNCH",
       "Node": "MemFreq",
       "Duration": 1000,
@@ -1596,13 +1575,14 @@
       "PID_On": true,
       "PID_Po": 2.0,
       "PID_Pu": 1.0,
-      "PID_I": 0.001,
+      "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": 185,
       "UclampMin_High": 384,
       "UclampMin_Low": 2,
       "SamplingWindow_P": 1,
@@ -1619,13 +1599,14 @@
       "PID_On": true,
       "PID_Po": 2.0,
       "PID_Pu": 1.0,
-      "PID_I": 0.001,
+      "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": 129,
       "UclampMin_High": 384,
       "UclampMin_Low": 2,
       "SamplingWindow_P": 1,
@@ -1642,13 +1623,14 @@
       "PID_On": true,
       "PID_Po": 2.0,
       "PID_Pu": 1.0,
-      "PID_I": 0.001,
+      "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": 129,
       "UclampMin_High": 384,
       "UclampMin_Low": 2,
       "SamplingWindow_P": 1,
@@ -1675,6 +1657,7 @@
       "SamplingWindow_I": 1,
       "SamplingWindow_D": 1,
       "UclampMin_On": true,
+      "UclampMin_Init": 200,
       "UclampMin_High": 157,
       "UclampMin_Low": 157,
       "ReportingRateLimitNs": 1,
@@ -1698,6 +1681,7 @@
       "SamplingWindow_I": 1,
       "SamplingWindow_D": 1,
       "UclampMin_On": true,
+      "UclampMin_Init": 200,
       "UclampMin_High": 42,
       "UclampMin_Low": 42,
       "ReportingRateLimitNs": 1,
@@ -1721,6 +1705,7 @@
       "SamplingWindow_I": 1,
       "SamplingWindow_D": 1,
       "UclampMin_On": true,
+      "UclampMin_Init": 200,
       "UclampMin_High": 0,
       "UclampMin_Low": 0,
       "ReportingRateLimitNs": 1,