Commit graph

2238 commits

Author SHA1 Message Date
Lokesh Kumar Goel
abc5777051 Update bluejay SVN to 51 am: be1d0f6c38
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24895584

Change-Id: I426896ab3c85723d1cced3958c7f5b7b78845e8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-25 20:43:00 +00:00
Xin Li
27cc067aac [automerger skipped] Merge 10952656 am: 24cba1b02d -s ours
am skip reason: Merged-In I21193dd2a51d86c0c5ed04d48c188f906557be7c with SHA-1 2c840cedbf is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/25089492

Change-Id: Ib20640381054bba1fb00c6c5484b12fc5b5f7652
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19 18:48:01 +00:00
Xin Li
24cba1b02d Merge 10952656
Merged-In: I21193dd2a51d86c0c5ed04d48c188f906557be7c
Change-Id: Iffafbf45335d4af3635be599badc69f765b1320d
2023-10-17 10:05:54 -07:00
Roshan Pius
76a30c7050 Merge "bluejay: Replace NFC app with NFC apex" into main am: 1c66031b9e am: 35abd35c39 am: b1644a944c am: 82bdbb3751
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2779508

Change-Id: Id35526ef528b708275d89319520e43f6f2688f1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-16 20:49:15 +00:00
Roshan Pius
82bdbb3751 Merge "bluejay: Replace NFC app with NFC apex" into main am: 1c66031b9e am: 35abd35c39 am: b1644a944c
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2779508

Change-Id: I66fe9f2e337614fc296d4c1b02c490e43a3f78ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-16 20:13:12 +00:00
Roshan Pius
b1644a944c Merge "bluejay: Replace NFC app with NFC apex" into main am: 1c66031b9e am: 35abd35c39
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2779508

Change-Id: I3fcabe68c78d3b00a3baf38c2c9e1b1ecfb807dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-16 19:38:21 +00:00
Roshan Pius
35abd35c39 Merge "bluejay: Replace NFC app with NFC apex" into main am: 1c66031b9e
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2779508

Change-Id: I5f99bd729fd6f34e867076d9be9e660b12f10809
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-16 19:15:57 +00:00
Roshan Pius
1c66031b9e Merge "bluejay: Replace NFC app with NFC apex" into main 2023-10-16 18:31:03 +00:00
Lokesh Kumar Goel
10346ce553 Update bluejay SVN to 50 am: 9b309d763a
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24895526

Change-Id: Id4737296e1311fac016e08350c1ca0201ee8c891
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-16 05:04:26 +00:00
Roshan Pius
f67025292b bluejay: Replace NFC app with NFC apex
Bug: 303286040
Test: Compiles
Merged-In: Ief6317a97f4c0208e506afc17ed6ab37e81d2db1
Change-Id: Ief6317a97f4c0208e506afc17ed6ab37e81d2db1
2023-10-13 18:03:57 +00:00
Xin Li
2c840cedbf [automerger skipped] Merge Android 14 am: 27a7db0162 -s ours am: b99740f973 -s ours am: 53d5d3e010 -s ours am: 5144fcfb74 -s ours
am skip reason: Merged-In Iecbf06a898f2c57da1ec29f6e5eb35241a3ec4f3 with SHA-1 0ea630f587 is already in history

Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2775835

Change-Id: I21193dd2a51d86c0c5ed04d48c188f906557be7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 11:00:21 +00:00
Xin Li
5144fcfb74 [automerger skipped] Merge Android 14 am: 27a7db0162 -s ours am: b99740f973 -s ours am: 53d5d3e010 -s ours
am skip reason: Merged-In Iecbf06a898f2c57da1ec29f6e5eb35241a3ec4f3 with SHA-1 0ea630f587 is already in history

Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2775835

Change-Id: I4d0f567451d80160a5db8595f2e9151393bfdda9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 09:50:31 +00:00
Xin Li
53d5d3e010 [automerger skipped] Merge Android 14 am: 27a7db0162 -s ours am: b99740f973 -s ours
am skip reason: Merged-In Iecbf06a898f2c57da1ec29f6e5eb35241a3ec4f3 with SHA-1 0ea630f587 is already in history

Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2775835

Change-Id: Iaf4888b74fd9817762fe4cf0d3b3d372c8affd9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 08:58:56 +00:00
Xin Li
b99740f973 [automerger skipped] Merge Android 14 am: 27a7db0162 -s ours
am skip reason: Merged-In Iecbf06a898f2c57da1ec29f6e5eb35241a3ec4f3 with SHA-1 0ea630f587 is already in history

Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2775835

Change-Id: I7882c11a29328f5077626b90364f28562b969df2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 07:51:50 +00:00
Xin Li
27a7db0162 Merge Android 14
Bug: 298295554
Merged-In: Iecbf06a898f2c57da1ec29f6e5eb35241a3ec4f3
Change-Id: I9a5965085ad017c52637497f38e34100e039c8cd
2023-10-05 15:32:08 -07:00
Xin Li
d37e5b4997 [automerger skipped] Merge UP1A.231005.007 am: 856bb61b7d -s ours am: a3e430e4e4 -s ours am: 02f8503d75 -s ours
am skip reason: Merged-In Iecbf06a898f2c57da1ec29f6e5eb35241a3ec4f3 with SHA-1 d0c9858ecd is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24879335

Change-Id: I8c9d882b30602d25257dbc775dcc7dd80d86ac86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-29 09:04:35 +00:00
Xin Li
02f8503d75 [automerger skipped] Merge UP1A.231005.007 am: 856bb61b7d -s ours am: a3e430e4e4 -s ours
am skip reason: Merged-In Iecbf06a898f2c57da1ec29f6e5eb35241a3ec4f3 with SHA-1 d0c9858ecd is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24879335

Change-Id: I8fb5873e56341a2de110c601454e3377a9b0852d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-29 08:16:32 +00:00
Xin Li
a3e430e4e4 [automerger skipped] Merge UP1A.231005.007 am: 856bb61b7d -s ours
am skip reason: Merged-In Iecbf06a898f2c57da1ec29f6e5eb35241a3ec4f3 with SHA-1 d0c9858ecd is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24879335

Change-Id: I0ef2a99b0d9876400a0c992206a19f54ce99a738
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-29 07:15:42 +00:00
Lokesh Kumar Goel
be1d0f6c38 Update bluejay SVN to 51
Bug: 302612466
Change-Id: If8f16626a5e13f98e81ff0833a60888efe9cddcd
2023-09-29 01:15:32 +00:00
Lokesh Kumar Goel
9b309d763a Update bluejay SVN to 50
Bug: 302612466
Change-Id: I7393253ef50c9b1da0f683ffcdd9cd191c8ab1f6
2023-09-29 01:13:58 +00:00
Xin Li
856bb61b7d Merge UP1A.231005.007
Bug: 291102124
Merged-In: Iecbf06a898f2c57da1ec29f6e5eb35241a3ec4f3
Change-Id: I2082f1cf1b4b9e607ff710b223552f66babbb122
2023-09-27 16:04:11 -07:00
Rick Yiu
ab6c5825c6 Disable limiting camera_hal for LAUNCH hint am: dba182188e
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24798149

Change-Id: I7a35549201eaa230c65cfef3b3d15985ba130a76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 07:57:37 +00:00
Rick Yiu
dba182188e Disable limiting camera_hal for LAUNCH hint
If auto rotation is enabled, it will trigger LAUNCH hint while
camera is running if device rotates, which could limit camera_hal
tasks to little cores. So, disable it first until there is a new
hint for the rotation event.

Bug: 297273578
Test: build pass
Change-Id: Ib92bb1ee5833924a1e34b8c91e15f6cb26a0e645
2023-09-19 03:04:17 +00:00
Treehugger Robot
16f80d40da Merge "Revert "DeviceAsWebcam: Add overlays for physical camera id"" into udc-qpr-dev am: eb91bc0b4a
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24737613

Change-Id: Ic0c7d735bac036e5493f640ba742e10c79f594a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-13 02:09:15 +00:00
Treehugger Robot
eb91bc0b4a Merge "Revert "DeviceAsWebcam: Add overlays for physical camera id"" into udc-qpr-dev 2023-09-13 01:38:44 +00:00
Jayant Chowdhary
c1f4f50bd0 Revert "DeviceAsWebcam: Add overlays for physical camera id"
This reverts commit 89f99fd401.

Reason for revert: With stream use case VIDEO_CALL + logical stream power is well within the permissible limit of 3W.

Bug: 300166920

Change-Id: I2d764fdf2dc3124d3f60513c5e76108b52ed8f7b
2023-09-12 23:46:56 +00:00
Ankur Bakshi
ba13ce4d9b Update bluejay SVN to 49 am: b2ee8ab0f5 am: 1b579be017 am: 3b21269752
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24697428

Change-Id: If5b1a365b22b717683d35d5bfa93de294320ce36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 20:35:22 +00:00
Ankur Bakshi
701b728c8d Update bluejay SVN to 48 am: d293f75732 am: 6d04514bb1 am: 29e278a0d1
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24686398

Change-Id: Iabb29ada22e46dda04be212214a8aef0982d36cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 20:35:19 +00:00
Ankur Bakshi
0c15e70f7a Update bluejay SVN to 49 am: b2ee8ab0f5 am: 37e2228f47 am: 75ac2a1f9a
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24697428

Change-Id: Ia4e64e249d80ddcb2c962e408ee657594e621352
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 20:30:58 +00:00
Ankur Bakshi
9fc2e765bd Update bluejay SVN to 48 am: d293f75732 am: 83bd8adfb0 am: 896efaa41b
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24686398

Change-Id: I7aedba5fcd292455dda8595b34b80b286a335ecb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 20:30:56 +00:00
Ankur Bakshi
50e711ad53 Update bluejay SVN to 49 am: b2ee8ab0f5 am: 1b579be017 am: 5b344c9b98
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24697428

Change-Id: Ifed2cec07af2bdfffa06cdc4ff87c002ec0555ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 20:26:26 +00:00
Ankur Bakshi
b682178dad Update bluejay SVN to 48 am: d293f75732 am: 6d04514bb1 am: d6931427b1
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24686398

Change-Id: I39b34dcb3f8d485d870a1a0a4f6669aa8e467d8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 20:26:23 +00:00
Ankur Bakshi
3b21269752 Update bluejay SVN to 49 am: b2ee8ab0f5 am: 1b579be017
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24697428

Change-Id: I11e8f02f5fd7f28b4480a52400f19ba82e870900
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 19:50:15 +00:00
Ankur Bakshi
29e278a0d1 Update bluejay SVN to 48 am: d293f75732 am: 6d04514bb1
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24686398

Change-Id: I566a4e85d5e55ec99cdce843845b36b52c47f6ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 19:50:12 +00:00
Ankur Bakshi
75ac2a1f9a Update bluejay SVN to 49 am: b2ee8ab0f5 am: 37e2228f47
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24697428

Change-Id: Iaae5c7c9184ddb5a5be65e9f5ef20125bc48003c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 19:49:26 +00:00
Ankur Bakshi
896efaa41b Update bluejay SVN to 48 am: d293f75732 am: 83bd8adfb0
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24686398

Change-Id: I6741ec8eb74a6c8ee5f00eb5f07c0d27024bca80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 19:49:23 +00:00
Ankur Bakshi
5b344c9b98 Update bluejay SVN to 49 am: b2ee8ab0f5 am: 1b579be017
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24697428

Change-Id: Ia39aa17adb458252dd06a342933d94e60a422528
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 19:46:08 +00:00
Ankur Bakshi
d6931427b1 Update bluejay SVN to 48 am: d293f75732 am: 6d04514bb1
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24686398

Change-Id: I83d654f963622f3092c7032d714c42be5ea91dc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 19:46:04 +00:00
Ankur Bakshi
1b579be017 Update bluejay SVN to 49 am: b2ee8ab0f5
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24697428

Change-Id: I1918b737fbd0d7dd53326bdbe111b4c02dd9c270
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 18:52:50 +00:00
Ankur Bakshi
6d04514bb1 Update bluejay SVN to 48 am: d293f75732
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24686398

Change-Id: I153d76aa758b5e00b01978378d37b6b3f0842abb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 18:52:47 +00:00
Ankur Bakshi
37e2228f47 Update bluejay SVN to 49 am: b2ee8ab0f5
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24697428

Change-Id: I0fcf858237510c9abde501328184518fbf37e528
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 18:50:49 +00:00
Ankur Bakshi
83bd8adfb0 Update bluejay SVN to 48 am: d293f75732
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24686398

Change-Id: I9752865b3210328a789ea985594ca8e6f805b531
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 18:50:47 +00:00
Ankur Bakshi
b2ee8ab0f5 Update bluejay SVN to 49
Bug: 298087649
Change-Id: I36c2925303fecddc613d25e34faaada5d5ed4485
2023-09-07 23:51:48 +00:00
Ankur Bakshi
d293f75732 Update bluejay SVN to 48
Bug: 298087649
Change-Id: I18efad473df907d05dd61dd3ad4c28f3a6c2d463
2023-09-07 02:41:57 +00:00
Xin Li
de7f7c1ddf [automerger skipped] Merge UP1A.230905.019 am: 791d3759a7 -s ours am: cd93e5598a -s ours am: d1938e5b4d -s ours
am skip reason: Merged-In I5e7ecc45c732b5711d076b1e5783355a07c92846 with SHA-1 3d9216ab4a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24625489

Change-Id: I7fc653bc89eebfb1d31cfe8a2d60c12a46210962
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-05 21:07:38 +00:00
Xin Li
d1938e5b4d [automerger skipped] Merge UP1A.230905.019 am: 791d3759a7 -s ours am: cd93e5598a -s ours
am skip reason: Merged-In I5e7ecc45c732b5711d076b1e5783355a07c92846 with SHA-1 3d9216ab4a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24625489

Change-Id: I132dfa1c4e95ab4e7d440f7cb2de38b9402b6bf4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-05 20:34:52 +00:00
Xin Li
cd93e5598a [automerger skipped] Merge UP1A.230905.019 am: 791d3759a7 -s ours
am skip reason: Merged-In I5e7ecc45c732b5711d076b1e5783355a07c92846 with SHA-1 3d9216ab4a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24625489

Change-Id: Id167c4d7a74539f27681b768e4cef90899684730
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-05 19:45:31 +00:00
Xin Li
791d3759a7 Merge UP1A.230905.019
Merged-In: I5e7ecc45c732b5711d076b1e5783355a07c92846
Change-Id: I3d31ca80c8ab03ed919748217efc9dae404b9b2e
2023-08-31 12:10:57 -07:00
Wayne Lin
43e735086d gps: enable always-on measurements log am: 6accd95bef
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24579395

Change-Id: I0afdd4ff1bd1d7860190501d3348be1693957aca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-31 13:49:12 +00:00
Android Build Coastguard Worker
dd597adea0 [coastguard skipped] Merge sparse cherrypicks from sparse-10740638-L17800000962853027 into udc-release.
COASTGUARD_SKIP: I2bcf78393b58127cba966c1fb6b61a840009437f
COASTGUARD_SKIP: Iecbf06a898f2c57da1ec29f6e5eb35241a3ec4f3

Change-Id: I751d95dccd09c16dc07aa1fda875683cb70bc092
2023-08-30 23:17:35 +00:00