Commit graph

2518 commits

Author SHA1 Message Date
Treehugger Robot
28a3b7b44d Merge "Fix lunch choices for git_main" into main 2023-10-25 23:42:17 +00:00
Greg Kaiser
c0159563f3 Fix lunch choices for git_main
We add "trunk_staging-" for all COMMON_LUNCH_CHOICES so they are
valid in the trunk stable setup.

Bug: 307738446
Test: lunch
Change-Id: I47590aaf84bd2481d53c04889c2963e02b7a816d
2023-10-25 15:37:23 -06:00
Lokesh Kumar Goel
e15a8f14e6 Update bluejay SVN to 51 am: be1d0f6c38 am: abc5777051
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24895584

Change-Id: I5b5596a2b424a83805201d0099e7aa8b9a24cdc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-25 21:09:44 +00:00
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
TeYuan Wang
bfec851399 thermal: align the setting VSKIN related sensors
Bug: 302435949
Test: emul_temp
Change-Id: Ib8ca404fe575ade08146e612354f8f06734eab72
2023-10-20 13:50:17 -07:00
Xin Li
551ae6bc31 [automerger skipped] Merge 10952656 am: 24cba1b02d -s ours am: 27cc067aac -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: I06ab1ba2168927a45f47150dc0991739b9b5690f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19 23:54:46 +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
59bad4f222 [automerger skipped] Merge "bluejay: Replace NFC app with NFC apex" into main am: 1c66031b9e am: 35abd35c39 am: b1644a944c am: 82bdbb3751 am: 76a30c7050 -s ours
am skip reason: Merged-In Ief6317a97f4c0208e506afc17ed6ab37e81d2db1 with SHA-1 168fe64455 is already in history

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

Change-Id: I101c2c8cdc2f75043d3c7915681a63d0cea5942b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-16 20:57:56 +00: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
3c9c537363 Update bluejay SVN to 50 am: 9b309d763a am: 10346ce553
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24895526

Change-Id: I38be00002a317c2631383ff4cf69248798ba22f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-16 05:35:26 +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
Guibing Cai
67a3395370 Merge "powerhint: bluejay: update vendor_sched procfs paths" into main 2023-10-13 17:19:11 +00:00
guibing
5f5a34609b powerhint: bluejay: update vendor_sched procfs paths
Vendor sched procfs path hierarchy gets updated in kernel.
Update the paths in powerhint json file to match the change.

Bug: 289151587
Test: Uibench ab test
Change-Id: I08b099b8267a8744ec50175d3284fb48a404c285
2023-10-11 23:57:35 +00:00
Roshan Pius
168fe64455 bluejay: Replace NFC app with NFC apex
Bug: 303286040
Test: Compiles
(cherry picked from https://android-review.googlesource.com/q/commit:f09150e453cbc609d1d45a72fabb3eb8bff6bba1)
Merged-In: Ief6317a97f4c0208e506afc17ed6ab37e81d2db1
Change-Id: Ief6317a97f4c0208e506afc17ed6ab37e81d2db1
2023-10-09 19:56:02 +00:00
Xin Li
70cccd6310 [automerger skipped] Merge Android 14 am: 27a7db0162 -s ours am: b99740f973 -s ours am: 53d5d3e010 -s ours am: 5144fcfb74 -s ours am: 2c840cedbf -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: I55b7b127458cd9be84243c05c6e92c2b0cc0bef9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-07 00:19:52 +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
ClintChen
fbf46c398a b3: Enable build flag versioning for radio and bootloader
Bug: 301142125
Change-Id: I665ab708541ca3b6d027daa3cf66ed66d211242b
2023-10-04 09:26:52 +00:00
Jimmy Shiu
722fc7d417 Merge "powerhint: Add DISPLAY_CHANGE hint" into main 2023-10-03 14:57:44 +00:00
Xin Li
3037971877 [automerger skipped] Merge UP1A.231005.007 am: 856bb61b7d -s ours am: a3e430e4e4 -s ours am: 02f8503d75 -s ours am: d37e5b4997 -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: Ia6db7b2539aeb8118fc482334867499f23202e0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-29 10:20:35 +00: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
Maciej Żenczykowski
5325728bfc OWNERS: master -> main
Change-Id: I27239c7c754c1c58b72e4c24e782119364617f42
2023-09-28 00:29:21 +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
Jimmy Shiu
b0730273ad powerhint: Add DISPLAY_CHANGE hint
Add DISPLAY_CHANGE hint for display layout change due to rotation or
switching between inner and outer panels.

Bug: 298150450
Test: build pass
Change-Id: I397334d53c89b65af54e91455b76f0036754738e
2023-09-23 12:25:20 +08:00
Rick Yiu
e8ac435fd9 Disable limiting camera_hal for LAUNCH hint am: dba182188e am: ab6c5825c6
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24798149

Change-Id: Iec4f2516dffaa606a8f33863e6e5f97d3bda315c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 08:03:26 +00: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
9de9e84de4 Merge "Revert "DeviceAsWebcam: Add overlays for physical camera id"" into udc-qpr-dev am: eb91bc0b4a am: 16f80d40da
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24737613

Change-Id: I72fc433b00372f01a1b2f9fe1580873474952775
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-13 03:00:52 +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
e381733600 Update bluejay SVN to 49 am: b2ee8ab0f5 am: 1b579be017 am: 3b21269752 am: ba13ce4d9b
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24697428

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

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

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

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

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

Change-Id: I1a90e8663e5c94745a1240c47d03ad093f507a5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 21:21:30 +00:00