Carter Hsu
215395da95
Merge "audio: Update Fortemedia tuning" into main
2023-12-12 05:48:31 +00:00
Ankur Bakshi
46acf16c61
Merge "Update husky SVN to 12" into udc-qpr-dev am: 19c1d74405
am: d9a7ebc197
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/shusky/+/25618059
Change-Id: Ibf750718df855595f8a0f6adfcdaab8aa7242c41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-12 00:46:20 +00:00
Ankur Bakshi
440cba4907
Update shiba SVN to 12 am: 2f87d29fbe
am: bb98ad7456
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/shusky/+/25618000
Change-Id: I34bcacd760a16e521e5499a69ec611c97fd307fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-12 00:46:16 +00:00
Ankur Bakshi
d9a7ebc197
Merge "Update husky SVN to 12" into udc-qpr-dev am: 19c1d74405
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/shusky/+/25618059
Change-Id: I9bf31f8e51f296c01ca934e1c99b04b477eaa01a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-12 00:14:22 +00:00
Ankur Bakshi
bb98ad7456
Update shiba SVN to 12 am: 2f87d29fbe
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/shusky/+/25618000
Change-Id: I57e052998c48d76687b8973104386ee775b70e96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-12 00:14:17 +00:00
Ankur Bakshi
19c1d74405
Merge "Update husky SVN to 12" into udc-qpr-dev
2023-12-11 23:39:30 +00:00
Xin Li
ec88118eb2
[automerger skipped] Merge Android 14 QPR1 am: ad5cc178e1
-s ours am: b398916a51
-s ours am: 51e3559f5c
-s ours
...
am skip reason: Merged-In I3b4d08e3a3fd62a4887a518e9ad93294700693b3 with SHA-1 e2d2ed85ed
is already in history
Original change: https://android-review.googlesource.com/c/device/google/shusky/+/2865655
Change-Id: I56b8019b8ad770e46f82f11efcc1fb7f4284c55a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 22:57:37 +00:00
Xin Li
51e3559f5c
[automerger skipped] Merge Android 14 QPR1 am: ad5cc178e1
-s ours am: b398916a51
-s ours
...
am skip reason: Merged-In I3b4d08e3a3fd62a4887a518e9ad93294700693b3 with SHA-1 e2d2ed85ed
is already in history
Original change: https://android-review.googlesource.com/c/device/google/shusky/+/2865655
Change-Id: I544a128c147939d3ade745110bf189c374036368
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 22:02:25 +00:00
Xin Li
b398916a51
[automerger skipped] Merge Android 14 QPR1 am: ad5cc178e1
-s ours
...
am skip reason: Merged-In I3b4d08e3a3fd62a4887a518e9ad93294700693b3 with SHA-1 e2d2ed85ed
is already in history
Original change: https://android-review.googlesource.com/c/device/google/shusky/+/2865655
Change-Id: Ib1368427030a68a3737fabec00f5884570de38e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 21:16:36 +00:00
Ankur Bakshi
f8afb5a508
Update husky SVN to 12
...
Bug: 313797924
Change-Id: Idd554ae7c2454854b8bba9c05876f7dc69a38f3e
2023-12-11 20:13:17 +00:00
Ankur Bakshi
2f87d29fbe
Update shiba SVN to 12
...
Bug: 313797924
Change-Id: I47ff4790276c2e9dc8b4c3a211c8079d8a7d7414
2023-12-11 20:12:22 +00:00
George Chang
826cf6135d
[NFC] Update sku id for shiba am: 66faa9c03a
am: e42346cb41
am: 2009792bbb
...
Original change: https://android-review.googlesource.com/c/device/google/shusky/+/2859065
Change-Id: Ia9ab7841847e8ab0c272dc91013b71f6b1a16c41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 19:53:28 +00:00
Roshan Pius
5f9ac43cb7
[automerger skipped] Merge "Revert "shusky(nfc): Modify NFC overlays for NFC apex"" into main am: 0750e5b918
am: 6678bbd076
am: 46c323e195
-s ours
...
am skip reason: Merged-In I08a0c9967cd5da77d59ef60627b793efcf2d8377 with SHA-1 d92852d647
is already in history
Original change: https://android-review.googlesource.com/c/device/google/shusky/+/2817311
Change-Id: Ic0294dd6b29de78fb55ea411b5359db9baa42064
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 19:53:14 +00:00
Roshan Pius
db1f748ad9
[automerger skipped] Revert "shusky: Replace NFC app with NFC apex" am: 18ec58ff4d
-s ours am: fb1f42b7c8
-s ours am: 0f9924bb74
-s ours
...
am skip reason: skipped by user rpius
Original change: https://android-review.googlesource.com/c/device/google/shusky/+/2816777
Change-Id: Id172c0105d2608858b74e0c81271a6e5e8314e4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 19:53:10 +00:00
George Chang
2009792bbb
[NFC] Update sku id for shiba am: 66faa9c03a
am: e42346cb41
...
Original change: https://android-review.googlesource.com/c/device/google/shusky/+/2859065
Change-Id: Ie1105aff9b643b9d8821036033fa823c33e0c50e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 19:24:17 +00:00
Roshan Pius
46c323e195
Merge "Revert "shusky(nfc): Modify NFC overlays for NFC apex"" into main am: 0750e5b918
am: 6678bbd076
...
Original change: https://android-review.googlesource.com/c/device/google/shusky/+/2817311
Change-Id: Ie5956d248940b4c9d9dae77c4bd6721e219e15f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 19:24:07 +00:00
Roshan Pius
0f9924bb74
[automerger skipped] Revert "shusky: Replace NFC app with NFC apex" am: 18ec58ff4d
-s ours am: fb1f42b7c8
-s ours
...
am skip reason: skipped by user rpius
Original change: https://android-review.googlesource.com/c/device/google/shusky/+/2816777
Change-Id: Ie4855967d3fd5c04e64b383e70121843bcba6652
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 19:24:04 +00:00
George Chang
e42346cb41
[NFC] Update sku id for shiba am: 66faa9c03a
...
Original change: https://android-review.googlesource.com/c/device/google/shusky/+/2859065
Change-Id: I64f46eaa8e5a8b7db691f720d6c7b216b47cedc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 18:51:02 +00:00
Roshan Pius
6678bbd076
Merge "Revert "shusky(nfc): Modify NFC overlays for NFC apex"" into main am: 0750e5b918
...
Original change: https://android-review.googlesource.com/c/device/google/shusky/+/2817311
Change-Id: I38b83146e5fd603ad2104d0f8ef438c23fd2172e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 18:50:50 +00:00
Roshan Pius
fb1f42b7c8
[automerger skipped] Revert "shusky: Replace NFC app with NFC apex" am: 18ec58ff4d
-s ours
...
am skip reason: skipped by user rpius
Original change: https://android-review.googlesource.com/c/device/google/shusky/+/2816777
Change-Id: I1cad326d9fd0a654a30a9fea67e12602bc443e7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 18:50:47 +00:00
Carter Hsu
145f10c929
audio: Update Fortemedia tuning
...
1. Optimize kid's voice parameter for HA NB/WB/SWB and HH WB/SWB
DR_RESRV_5: 0x0064
DR_RESRV_6: 0x1000
2. Apply HA/HH to TX co-use user cases: BT-HAC, Cust1, Cust2, Reserve1, Headphone, TTY-VCO
Bug: 315755480
Test: Verified by test build
Change-Id: Iced6eb56144bdb100fa0db64e11cba305da68b00
Signed-off-by: Carter Hsu <carterhsu@google.com>
2023-12-11 18:09:59 +08:00
Xin Li
ad5cc178e1
Merge Android 14 QPR1
...
Merged-In: I3b4d08e3a3fd62a4887a518e9ad93294700693b3
Bug: 315507370
Change-Id: Idac49a7a1c71b017efadae2ea3d58422e9b41093
2023-12-08 13:15:54 -08:00
Xin Li
808f4f5fca
[automerger skipped] Merge UQ1A.231205.015 am: e2d2ed85ed
-s ours am: dc1e99d2e4
-s ours
...
am skip reason: Merged-In I38bce6825ac29b93a6691cee6cca312be3db874e with SHA-1 6f2da6ead2
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/shusky/+/25590376
Change-Id: Iee62255b74da8f20dc1f4d3c5fc4d0dbfcf229d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08 08:51:03 +00:00
Xin Li
dc1e99d2e4
[automerger skipped] Merge UQ1A.231205.015 am: e2d2ed85ed
-s ours
...
am skip reason: Merged-In I38bce6825ac29b93a6691cee6cca312be3db874e with SHA-1 6f2da6ead2
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/shusky/+/25590376
Change-Id: I3b70dcb945156c63809469fecb1ae7f3aeae3bff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08 08:21:16 +00:00
Xin Li
e2d2ed85ed
Merge UQ1A.231205.015
...
Bug: 308969284
Merged-In: I38bce6825ac29b93a6691cee6cca312be3db874e
Change-Id: I3b4d08e3a3fd62a4887a518e9ad93294700693b3
2023-12-07 15:47:37 -08:00
Treehugger Robot
351a4a7fd1
Merge "audio: add opus support for decoded offload" into main
2023-12-07 02:59:18 +00:00
Roshan Pius
475f1f08a7
Merge changes from topic "revert-25281051-nfc_apex_revert-MYIKRJSXVD" into main
...
* changes:
Revert^2 "shusky(nfc): Modify NFC overlays for NFC apex"
Revert^2 "shusky: Replace NFC app with NFC apex"
2023-12-06 14:57:32 +00:00
George Chang
66faa9c03a
[NFC] Update sku id for shiba
...
Bug: 314858460
Test: manual
Change-Id: Iea3260a0e8b1679db0e3a2e5cf32d3d54c904ae7
2023-12-05 08:08:05 +00:00
George Chang
337c71617d
[NFC] Update sku id for shiba
...
Bug: 314858460
Test: manual
Change-Id: Iea3260a0e8b1679db0e3a2e5cf32d3d54c904ae7
2023-12-05 10:03:46 +08:00
Roshan Pius
93e2530f35
Revert^2 "shusky(nfc): Modify NFC overlays for NFC apex"
...
d92852d647
Bug: 303286040
Test: Compiles
Change-Id: Id67a6514a7d3f0359d95aa06c31cb694e9b35ffa
2023-12-04 13:54:12 -08:00
Roshan Pius
53b580feb7
Revert^2 "shusky: Replace NFC app with NFC apex"
...
4454d4b92a
Bug: 303286040
Test: Compiles
Change-Id: I3dd0989970cc111befd6098da567da977e7656cf
2023-12-04 11:57:37 -08:00
Hawkwood Glazier
74ce3d81b4
Adjust spacing to account for b/313530576
...
Flag: None
Bug: 313530576
Test: Manually checked device, screenshot tests
Change-Id: I1ce60e4b7528b57a4f63891f3820539505a9c37a
2023-12-01 22:02:43 +00:00
Treehugger Robot
7a7341bfdf
Merge "uwb: set calibrations for v6.3" into main
2023-12-01 17:16:33 +00:00
Treehugger Robot
9200265c28
Merge "Enable LE audio dual mic SWB" into main
2023-12-01 12:27:51 +00:00
Victor Liu
f39e1b74cc
uwb: set calibrations for v6.3
...
Bug: 311753464
Change-Id: I3f0269c6d85569b215dd42abf580c6ae9432fff9
2023-12-01 03:47:34 +00:00
Lisa (LeeWei) Liu
45aa0d9c2b
Merge "shusky: Change util threshold of LC" into main
2023-11-30 07:56:02 +00:00
Treehugger Robot
116b1597bc
Merge "Uwb: Enable Dck R3 flag for ripcurrent" into main
2023-11-30 02:33:44 +00:00
Lisa Liu
63ce8e2275
shusky: Change util threshold of LC
...
Changed to 50 percent. Keep LC util threshold 1280 for
GAME/ CAMERA_STREAMING_LOW/ CAMERA_STREAMING_STANDARD.
Bug: 303725890
Bug: 261704404
Test: scolloing CUJ
Change-Id: I0f48203dcfb8b3b650b593beed19bc050f710f9f
2023-11-30 01:58:40 +00:00
Hasan Awais
388575e68a
Uwb: Enable Dck R3 flag for ripcurrent
...
Bug: 262042601
Change-Id: Icaa2ada2f08b3b460c1d59538bf566f790fa0416
Signed-off-by: Hasan Awais <hasanawais@google.com>
2023-11-29 16:08:33 -08:00
Ankur Bakshi
eb41b137e9
Merge changes from topic "svn-feb-24" into udc-qpr-dev am: 876909d9d4
am: 47ada33332
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/shusky/+/25498860
Change-Id: I27539dba58b5908a92f45452beeeca7afca10375
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 23:05:48 +00:00
Ankur Bakshi
5ec9b3fc34
Update husky SVN to 10 am: 8310d49d51
am: c09886eb27
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/shusky/+/25499493
Change-Id: I55b7acd03120d3f9c6679f71d11eb21cef75163a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 23:05:41 +00:00
Ankur Bakshi
23c1834334
Update shiba SVN to 11 am: 50247665a0
am: f631d86540
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/shusky/+/25496612
Change-Id: Iea7df23ab2078c7d4b8ff8b00902f47328d96d18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 23:05:30 +00:00
Ankur Bakshi
ed4fbfdb8c
Update shiba SVN to 10 am: db101e499a
am: 77bd2526f3
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/shusky/+/25496611
Change-Id: Id5b39b0ccaa74aac701de7338393dc39c8cea0ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 23:05:23 +00:00
Ankur Bakshi
47ada33332
Merge changes from topic "svn-feb-24" into udc-qpr-dev am: 876909d9d4
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/shusky/+/25498860
Change-Id: I660c3f4e34a0efb8f3dcde07eda384413a1d6865
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 22:35:24 +00:00
Ankur Bakshi
c09886eb27
Update husky SVN to 10 am: 8310d49d51
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/shusky/+/25499493
Change-Id: I00067c1966dd3d6447d3ca749a1149737b915fe0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 22:35:13 +00:00
Ankur Bakshi
f631d86540
Update shiba SVN to 11 am: 50247665a0
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/shusky/+/25496612
Change-Id: Ic74b4ce8615fdffbd4c37891d9cd2c7b68d8b83a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 22:35:04 +00:00
Ankur Bakshi
77bd2526f3
Update shiba SVN to 10 am: db101e499a
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/shusky/+/25496611
Change-Id: I7af7a812356fd61dadd264daa2a3dbc447e6fc05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 22:34:59 +00:00
Ankur Bakshi
876909d9d4
Merge changes from topic "svn-feb-24" into udc-qpr-dev
...
* changes:
Update husky SVN to 11
Update husky SVN to 10
2023-11-29 22:08:38 +00:00
Ankur Bakshi
b6c489280c
Update husky SVN to 11
...
Bug: 313696499
Change-Id: I0bb0b7914c3dcb9f63682be1f8005384ed61328e
2023-11-29 06:51:24 +00:00
Ankur Bakshi
8310d49d51
Update husky SVN to 10
...
Bug: 313696499
Change-Id: I7b6bd17cccd6fb31177b8ecdf72ab6096373f6b0
2023-11-29 06:48:39 +00:00