Merge "Revert "haptics: update hapitcs sink and slot setting"" into udc-d1-dev am: 9305489bee
am: fd341575b2
am: 87649982b7
Original change: https://googleplex-android-review.googlesource.com/c/device/google/shusky/+/23258598 Change-Id: If0cba6c5d15b291904adfce64fdaad1246ab51a0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
1e047bd405
3 changed files with 4 additions and 4 deletions
|
@ -42,7 +42,7 @@
|
|||
<ctl name="TDM_0_TX Sample Rate" value="SR_48K" />
|
||||
|
||||
<!-- Haptic setting -->
|
||||
<ctl name="Haptics Streaming Source" value="ASP Rx"/>
|
||||
<ctl name="Haptics Source" value="PCM"/>
|
||||
<ctl name="HAPTIC_RX Format" value="S32_LE"/>
|
||||
<ctl name="HAPTIC_RX SlotFmt" value="S32_LE"/>
|
||||
<ctl name="HAPTIC_RX Chan" value="Four"/>
|
||||
|
|
|
@ -39,8 +39,8 @@
|
|||
<ctl name="TDM_0_TX Sample Rate" value="SR_48K" />
|
||||
|
||||
<!-- Haptic setting -->
|
||||
<ctl name="Haptics Streaming Source" value="ASP Rx"/>
|
||||
<ctl name="HR Haptics Streaming Source" value="ASP Rx"/>
|
||||
<ctl name="Haptics Source" value="PCM"/>
|
||||
<ctl name="HR Haptics Source" value="PCM"/>
|
||||
<ctl name="HAPTIC_RX Format" value="S32_LE"/>
|
||||
<ctl name="HAPTIC_RX SlotFmt" value="S32_LE"/>
|
||||
<ctl name="HAPTIC_RX Chan" value="Four"/>
|
||||
|
|
|
@ -42,7 +42,7 @@
|
|||
<ctl name="TDM_0_TX Sample Rate" value="SR_48K" />
|
||||
|
||||
<!-- Haptic setting -->
|
||||
<ctl name="Haptics Streaming Source" value="ASP Rx"/>
|
||||
<ctl name="Haptics Source" value="PCM"/>
|
||||
<ctl name="HAPTIC_RX Format" value="S32_LE"/>
|
||||
<ctl name="HAPTIC_RX SlotFmt" value="S32_LE"/>
|
||||
<ctl name="HAPTIC_RX Chan" value="Four"/>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue