Carter Hsu
0bf4352732
audio: support incall capture dl/ul concurrent recording
...
Bug: 317726514
Test: Verified by test build
Change-Id: I4fa12659797778810b37819bb71ba2b09b757b45
Signed-off-by: Carter Hsu <carterhsu@google.com>
2023-12-26 00:58:38 +00:00
Ankur Bakshi
f97c864105
Merge "Update bluejay SVN to 55" into main
2023-12-20 04:18:36 +00:00
Cyan_Hsieh
e765ab049d
Branch bootloader prebuilts for 24Q2 release
...
Bug: 313350495
Change-Id: I72349a14a2fa1766ca6c2de28b2ec376ab59f99a
2023-12-13 08:34:46 +00:00
Treehugger Robot
1e6c17c489
[automerger skipped] Merge "Revert^2 "bluejay: Replace NFC app with NFC apex"" into main am: 9ed8f1c838
am: 6f1ec246bf
am: 692cf25016
-s ours
...
am skip reason: Merged-In Ibc741f24cc6d19adda3097d17bc81baf455f71d3 with SHA-1 35de536662
is already in history
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2863545
Change-Id: I891d0234ae0e30c13fbdd0ee73398317a8f29ad3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 23:23:21 +00:00
Treehugger Robot
12576f2147
[automerger skipped] Merge "Revert^2 "bluejay(nfc): Modify NFC overlays for NFC apex"" into main am: bf8ffb2c68
am: c70cb81a1a
am: 189134cc84
-s ours
...
am skip reason: Merged-In I443bcf2681437ec4a0caa3fdb5046ab856db0ddb with SHA-1 13426a9d37
is already in history
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2863495
Change-Id: Ia3a5ca0865bdd10e65360f8716264772a9a14121
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 23:23:05 +00:00
Xin Li
24ea019bb9
[automerger skipped] Merge Android 14 QPR1 am: 1c13e95346
-s ours am: 20b61831f1
-s ours am: b73add6ce4
-s ours
...
am skip reason: Merged-In Ib8c40e3ac85fb722adbe2ee4b7a2dadeba36c305 with SHA-1 e22d1ba5b6
is already in history
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2866377
Change-Id: Iafc5cf755aa6c75734aa825c2f0926aa0827e896
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 22:57:46 +00:00
Treehugger Robot
692cf25016
Merge "Revert^2 "bluejay: Replace NFC app with NFC apex"" into main am: 9ed8f1c838
am: 6f1ec246bf
...
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2863545
Change-Id: I80f198b7dcbef93eac6d312ee66d6a307e6d39d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 22:40:17 +00:00
Treehugger Robot
189134cc84
Merge "Revert^2 "bluejay(nfc): Modify NFC overlays for NFC apex"" into main am: bf8ffb2c68
am: c70cb81a1a
...
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2863495
Change-Id: I8ac1e88d5b7c1cb55f7ea20c7ba69688aca25975
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 22:40:04 +00:00
Treehugger Robot
6f1ec246bf
Merge "Revert^2 "bluejay: Replace NFC app with NFC apex"" into main am: 9ed8f1c838
...
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2863545
Change-Id: I9e990f1d600dc84b7fb3100c85e6032f43ce0ed2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 22:18:26 +00:00
Treehugger Robot
c70cb81a1a
Merge "Revert^2 "bluejay(nfc): Modify NFC overlays for NFC apex"" into main am: bf8ffb2c68
...
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2863495
Change-Id: I562c8d5919682668c75cec2d0eeef26c6a6b206a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 22:18:10 +00:00
Xin Li
b73add6ce4
[automerger skipped] Merge Android 14 QPR1 am: 1c13e95346
-s ours am: 20b61831f1
-s ours
...
am skip reason: Merged-In Ib8c40e3ac85fb722adbe2ee4b7a2dadeba36c305 with SHA-1 e22d1ba5b6
is already in history
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2866377
Change-Id: I3e0e095a016bdf641e5194b7baf1f18fd4f2836b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 22:02:34 +00:00
Treehugger Robot
9ed8f1c838
Merge "Revert^2 "bluejay: Replace NFC app with NFC apex"" into main
2023-12-11 22:00:34 +00:00
Treehugger Robot
bf8ffb2c68
Merge "Revert^2 "bluejay(nfc): Modify NFC overlays for NFC apex"" into main
2023-12-11 22:00:34 +00:00
Xin Li
20b61831f1
[automerger skipped] Merge Android 14 QPR1 am: 1c13e95346
-s ours
...
am skip reason: Merged-In Ib8c40e3ac85fb722adbe2ee4b7a2dadeba36c305 with SHA-1 e22d1ba5b6
is already in history
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2866377
Change-Id: If8887ac82ecabb11c7e600df5c9e5a9b6875216b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 21:16:45 +00:00
Xin Li
1c13e95346
Merge Android 14 QPR1
...
Merged-In: Ib8c40e3ac85fb722adbe2ee4b7a2dadeba36c305
Bug: 315507370
Change-Id: I736ed6ba143e55fbde9f763792bf98eea3150387
2023-12-08 13:13:09 -08:00
Xin Li
28f437ba44
[automerger skipped] Merge UQ1A.231205.015 am: e22d1ba5b6
-s ours am: fa0fb98c2f
-s ours
...
am skip reason: Merged-In I403e87cf5943f5c45d6d0db99a3e15018064067a with SHA-1 8f9b6dbaaa
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/25591208
Change-Id: Iee1f53eb474dc5b79c358c3972fc5e00c744baa3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08 08:51:07 +00:00
Xin Li
fa0fb98c2f
[automerger skipped] Merge UQ1A.231205.015 am: e22d1ba5b6
-s ours
...
am skip reason: Merged-In I403e87cf5943f5c45d6d0db99a3e15018064067a with SHA-1 8f9b6dbaaa
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/25591208
Change-Id: I53b028adafb054f2ad28c0c055e31ef88dd4aecd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08 08:21:19 +00:00
Xin Li
e22d1ba5b6
Merge UQ1A.231205.015
...
Bug: 308969284
Merged-In: I403e87cf5943f5c45d6d0db99a3e15018064067a
Change-Id: Ib8c40e3ac85fb722adbe2ee4b7a2dadeba36c305
2023-12-07 15:51:03 -08:00
Treehugger Robot
4895b40a23
Merge changes from topic "p21-gamemodetuning" into main
...
* changes:
powerhint: game mode tuning
powerhint: add game mode tuning nodes
2023-12-07 18:51:11 +00:00
Roshan Pius
8f013ac1a6
Revert^2 "bluejay(nfc): Modify NFC overlays for NFC apex"
...
041ffd8ea6
Bug: 303286040
Test: Compiles
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:13426a9d37641687908d97c969a2c547eb5f19cd )
Merged-In: I443bcf2681437ec4a0caa3fdb5046ab856db0ddb
Change-Id: I443bcf2681437ec4a0caa3fdb5046ab856db0ddb
Change-Id: Ic52d8977c950aec66a6206736fa0ded4adacb1c2
2023-12-07 10:26:16 -08:00
Roshan Pius
f9d6933a7c
Revert^2 "bluejay: Replace NFC app with NFC apex"
...
75bff8a95f
Bug: 303286040
Test: Compiles
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:35de536662907b57cb115afb3446096fb15e0d8b )
Merged-In: Ibc741f24cc6d19adda3097d17bc81baf455f71d3
Change-Id: Ibc741f24cc6d19adda3097d17bc81baf455f71d3
2023-12-06 21:30:51 +00:00
Roshan Pius
13426a9d37
Revert^2 "bluejay(nfc): Modify NFC overlays for NFC apex"
...
041ffd8ea6
Bug: 303286040
Test: Compiles
Change-Id: I443bcf2681437ec4a0caa3fdb5046ab856db0ddb
2023-12-04 13:48:34 -08:00
Roshan Pius
35de536662
Revert^2 "bluejay: Replace NFC app with NFC apex"
...
75bff8a95f
Bug: 303286040
Test: Compiles
Change-Id: Ibc741f24cc6d19adda3097d17bc81baf455f71d3
2023-12-04 11:52:21 -08:00
Ankur Bakshi
2cc93e92b3
Update bluejay SVN to 55
...
Bug: 313797924
Change-Id: Ie828075b65f51b1bb8109c0a330542b0f620b7ca
2023-11-29 23:39:56 +00:00
Ankur Bakshi
0993543fec
Update bluejay SVN to 54 am: 97ca2e0e16
am: 11681ac049
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/25498857
Change-Id: I699e3d42976347241e9605ace826fa80c3b505de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 23:05:23 +00:00
Ankur Bakshi
11681ac049
Update bluejay SVN to 54 am: 97ca2e0e16
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/25498857
Change-Id: Iae6988b087452e056db920b146c7b4aa37b7eaf9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 22:35:00 +00:00
Ankur Bakshi
97ca2e0e16
Update bluejay SVN to 54
...
Bug: 313696499
Change-Id: Iadb6f6d58659b63bb1d3d1fad6c6c839f899814c
2023-11-29 06:19:57 +00:00
Treehugger Robot
4f49b25fdc
Merge "[conflict] Remove unused Android.mk under device/google/bluejay am: 34aaf50436
am: 97d8fa99d2
" into udc-qpr-dev-plus-aosp am: 2d4767736f
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/25422286
Change-Id: I90daa087ffa06c6b99e6fd5f95574f51954a5fe4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-21 04:04:38 +00:00
Treehugger Robot
2d4767736f
Merge "[conflict] Remove unused Android.mk under device/google/bluejay am: 34aaf50436
am: 97d8fa99d2
" into udc-qpr-dev-plus-aosp
2023-11-21 03:25:34 +00:00
Herbert Xue
930cfe784b
[conflict] Remove unused Android.mk under device/google/bluejay am: 34aaf50436
am: 3a915de31c
am: 2ddcebecac
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/25420741
Change-Id: If2b52762be3294ba73e5014bb77156e2f2913752
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-21 03:14:57 +00:00
Herbert Xue
2ddcebecac
[conflict] Remove unused Android.mk under device/google/bluejay am: 34aaf50436
am: 3a915de31c
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/25420741
Change-Id: Ibc8eeffdb3ac3fea6b260105465da40b12002740
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-21 02:43:51 +00:00
Herbert Xue
3a915de31c
[conflict] Remove unused Android.mk under device/google/bluejay am: 34aaf50436
...
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2833591
Change-Id: I093a1c8ac7b50c5b1b601d54e465ca5ecbd87aff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-20 06:15:11 +00:00
Herbert Xue
5c58271bdd
[conflict] Remove unused Android.mk under device/google/bluejay am: 34aaf50436
am: 97d8fa99d2
...
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2833591
Change-Id: I56dee3e1b7b310cf9253f486b33241ac0aecf300
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-20 05:25:42 +00:00
Herbert Xue
97d8fa99d2
Remove unused Android.mk under device/google/bluejay am: 34aaf50436
...
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2833591
Change-Id: If934bea2fd396ce3b53484f7163392483362d434
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-20 03:23:54 +00:00
Herbert Xue
34aaf50436
Remove unused Android.mk under device/google/bluejay
...
Bug: 311323531
Test: NA
Change-Id: I211369e7edbf48463ab88dfd49ca05b33d5541d1
2023-11-16 15:42:56 +08:00
Treehugger Robot
b7fe1b234c
Merge "gps: Enable Vzw SUPL OTDOA" into main
2023-11-16 06:09:31 +00:00
Cheng Chang
dace074978
gps: Enable Vzw SUPL OTDOA
...
Bug: 310795649
Test: OTDOA test in b/310795649
Change-Id: I65e76c36c382fd51a32dc0b129250ea6a3dc6be3
2023-11-16 05:20:36 +00:00
Ankur Bakshi
34218b7f56
Update bluejay SVN to 53 am: 07440b702a
am: 1a582f21af
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/25293113
Change-Id: I5aafa5033504a8d50ea9ad1bc738b9996f402aee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16 04:59:09 +00:00
Ankur Bakshi
1a582f21af
Update bluejay SVN to 53 am: 07440b702a
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/25293113
Change-Id: I7e3d5a3f73012863056ae3e46c8c642eb332294e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16 04:29:00 +00:00
Roshan Pius
ac8d07020a
[automerger skipped] Merge changes from topic "nfc_apex_revert" into main am: 3ea3148bf7
am: 60ec70c8ac
-s ours am: 5d8e11e8c8
-s ours
...
am skip reason: Merged-In Ie6d5643f77a828f9a4254edd0ecf4fe28460a2f6 with SHA-1 b5ff2c83d3
is already in history
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2817309
Change-Id: I2bc76ccd6981f4d43b2678ab422f429bb02c7fa2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 23:34:38 +00:00
Roshan Pius
02de934f5c
[automerger skipped] Revert "bluejay(nfc): Modify NFC overlays for NFC apex" am: a940645a6e
am: 13b9a3e096
am: a0a1d5d898
-s ours
...
am skip reason: Merged-In Ia4d272bb55ed7fd9fc12090a6afde96fff84a9da with SHA-1 041ffd8ea6
is already in history
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2818124
Change-Id: I3c33b140a12313d38fbbed7fae44e0ed039e77a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 23:34:22 +00:00
Roshan Pius
a9c867f862
[automerger skipped] Merge changes from topic "nfc_apex_revert" into main am: 3ea3148bf7
am: 90deaed1ec
am: b5958e72c1
-s ours
...
am skip reason: Merged-In Ie6d5643f77a828f9a4254edd0ecf4fe28460a2f6 with SHA-1 75bff8a95f
is already in history
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2817309
Change-Id: I23c2324f7f316c837e0b4d6cc8e5922aea7bf98b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 23:30:54 +00:00
Roshan Pius
e2e33c30d0
[automerger skipped] Revert "bluejay(nfc): Modify NFC overlays for NFC apex" am: a940645a6e
am: 033e515e0a
am: 7c287ce810
-s ours
...
am skip reason: Merged-In Ia4d272bb55ed7fd9fc12090a6afde96fff84a9da with SHA-1 041ffd8ea6
is already in history
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2818124
Change-Id: Idf266c9eb0cde541bf6695b98b3c9ec6d493a47a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 23:30:34 +00:00
Roshan Pius
5d8e11e8c8
[automerger skipped] Merge changes from topic "nfc_apex_revert" into main am: 3ea3148bf7
am: 60ec70c8ac
-s ours
...
am skip reason: Merged-In Ie6d5643f77a828f9a4254edd0ecf4fe28460a2f6 with SHA-1 b5ff2c83d3
is already in history
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2817309
Change-Id: Ia0e67c4f32964211fc1c2ca02c76359aab6df3ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 22:48:57 +00:00
Roshan Pius
a0a1d5d898
Revert "bluejay(nfc): Modify NFC overlays for NFC apex" am: a940645a6e
am: 13b9a3e096
...
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2818124
Change-Id: Icd2da1eedac453c9f80cbf32f777b80b0742f35e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 22:48:40 +00:00
Roshan Pius
b5958e72c1
Merge changes from topic "nfc_apex_revert" into main am: 3ea3148bf7
am: 90deaed1ec
...
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2817309
Change-Id: Id47781a6cec01070565be7c2f67edc4cc8cc82f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 22:46:18 +00:00
Roshan Pius
7c287ce810
Revert "bluejay(nfc): Modify NFC overlays for NFC apex" am: a940645a6e
am: 033e515e0a
...
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2818124
Change-Id: I644d4b2f369e336ab0c1929ddaaef8f327361504
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 22:46:05 +00:00
Roshan Pius
60ec70c8ac
Merge changes from topic "nfc_apex_revert" into main am: 3ea3148bf7
...
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2817309
Change-Id: I0f7989411afb04eed83d741de1fabb304551763c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 21:49:10 +00:00
Roshan Pius
13b9a3e096
Revert "bluejay(nfc): Modify NFC overlays for NFC apex" am: a940645a6e
...
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2818124
Change-Id: I7d34f2e80cc65bfa0073cb843047ae71feaebf4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 21:48:53 +00:00
Roshan Pius
90deaed1ec
Merge changes from topic "nfc_apex_revert" into main am: 3ea3148bf7
...
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2817309
Change-Id: Iffae5bfd6abee081d9d4322a67225cc5efe3bc5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 21:45:43 +00:00