Merge cherrypicks of [12424653, 12424634, 12424654, 12424655, 12424585, 12424656, 12424657, 12424658, 12424659, 12424660, 12424661, 12424722, 12424723, 12424724, 12424725, 12424726, 12424511, 12424635, 12424636, 12424637, 12424638, 12424639] into rvc-d1-release
Change-Id: I13ed5420569de5b2bd7fef4d465c0cc8baaea324
diff --git a/audio/acdbdata/Handset_cal.acdb b/audio/acdbdata/Handset_cal.acdb
index 24e8b92..cdc22ed 100644
--- a/audio/acdbdata/Handset_cal.acdb
+++ b/audio/acdbdata/Handset_cal.acdb
Binary files differ
diff --git a/audio/acdbdata/workspaceFile.qwsp b/audio/acdbdata/workspaceFile.qwsp
index be2726b..794cc7e 100644
--- a/audio/acdbdata/workspaceFile.qwsp
+++ b/audio/acdbdata/workspaceFile.qwsp
Binary files differ
diff --git a/vibrator/drv2624/Vibrator.cpp b/vibrator/drv2624/Vibrator.cpp
index 823cc47..744f16e 100644
--- a/vibrator/drv2624/Vibrator.cpp
+++ b/vibrator/drv2624/Vibrator.cpp
@@ -60,7 +60,7 @@
// UT team design those target G values
static std::array<float, 5> EFFECT_TARGET_G = {0.275, 0.55, 0.6, 0.9, 1.12};
-static std::array<float, 3> STEADY_TARGET_G = {2.0, 1.145, 1.3};
+static std::array<float, 3> STEADY_TARGET_G = {2.15, 1.145, 1.3};
struct SensorContext {
ASensorEventQueue *queue;
