summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2020-08-21 16:35:12 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2020-08-21 16:35:12 +0000
commit04ca282e99f98d4b455d7b28922a672eab8c2722 (patch)
treeb61c1dcf2a168f8050ed458943b50e81c687641c
parenta1a87c331ddf2c0ee4d9c6fb16f3e60cef8e0b9a (diff)
parent2e2599114a8de2d01ba8ddeaab0e1d89116efcf4 (diff)
downloadredfin-04ca282e99f98d4b455d7b28922a672eab8c2722.tar.gz
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
-rw-r--r--audio/acdbdata/Handset_cal.acdbbin1269880 -> 1269834 bytes
-rw-r--r--audio/acdbdata/workspaceFile.qwspbin345072 -> 345136 bytes
-rw-r--r--vibrator/drv2624/Vibrator.cpp2
3 files changed, 1 insertions, 1 deletions
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 @@ static constexpr char WAVEFORM_HEAVY_CLICK_EFFECT_SEQ[] = "4 0";
// 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;