Commit graph

2279 commits

Author SHA1 Message Date
Xin Li
e22d1ba5b6 Merge UQ1A.231205.015
Bug: 308969284
Merged-In: I403e87cf5943f5c45d6d0db99a3e15018064067a
Change-Id: Ib8c40e3ac85fb722adbe2ee4b7a2dadeba36c305
2023-12-07 15:51:03 -08: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
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
Roshan Pius
033e515e0a 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: I20f7a7a2526280005d50c3d1f15b7a82d3f442ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 21:45:25 +00:00
Roshan Pius
3ea3148bf7 Merge changes from topic "nfc_apex_revert" into main
* changes:
  Revert "bluejay: Replace NFC app with NFC apex"
  Revert "bluejay(nfc): Modify NFC overlays for NFC apex"
2023-11-08 21:16:20 +00:00
Roshan Pius
b5ff2c83d3 Revert "bluejay: Replace NFC app with NFC apex"
Revert submission 24993894-cherrypicker-L80100000963393177:N49200001411943056

Reason for revert: Causing bootloop with signed builds

Reverted changes: /q/submissionid:24993894-cherrypicker-L80100000963393177:N49200001411943056

Bug: 309117462
Test: Compiles, device boots up
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:75bff8a95f3e1fbeeaffce4d2fe720152761edbd)
Merged-In: Ie6d5643f77a828f9a4254edd0ecf4fe28460a2f6
Change-Id: Ie6d5643f77a828f9a4254edd0ecf4fe28460a2f6
2023-11-07 06:10:47 +00:00
Roshan Pius
a940645a6e Revert "bluejay(nfc): Modify NFC overlays for NFC apex"
Revert submission 2802548-nfc_apex

Reason for revert: Causing bootloop with signed builds

Reverted changes: /q/submissionid:2802548-nfc_apex

Bug: 309117462
Test: Compiles, device boots up
Merged-In: Ia4d272bb55ed7fd9fc12090a6afde96fff84a9da
Change-Id: Ia4d272bb55ed7fd9fc12090a6afde96fff84a9da
2023-11-06 19:44:18 +00:00
Greg Kaiser
b4bbe177a3 Fix lunch choices for git_main am: bb35cfaea7
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2809994

Change-Id: I267fba100cf2500f834952fc212b680c12e8cdee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-30 17:22:04 +00:00
Greg Kaiser
bb35cfaea7 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
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:c0159563f3835c858d6587bebcbd87d123113530)
Merged-In: I47590aaf84bd2481d53c04889c2963e02b7a816d
Change-Id: I47590aaf84bd2481d53c04889c2963e02b7a816d
2023-10-30 16:41:50 +00:00
Android Build Coastguard Worker
a362098033 Merge cherrypicks of ['googleplex-android-review.googlesource.com/25177019', 'googleplex-android-review.googlesource.com/25069787', 'googleplex-android-review.googlesource.com/25176278'] into udc-qpr1-release.
Change-Id: I57dcbf0b3942451523291f5d793c643e5a4299cf
2023-10-27 03:36:01 +00:00
Ankur Bakshi
3a56f8bf7a Update bluejay SVN to 52
Bug: 302612466
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:8f9b6dbaaa8e78c8ded400d19d2f7d89fdaf2fd8)
Merged-In: I403e87cf5943f5c45d6d0db99a3e15018064067a
Change-Id: I403e87cf5943f5c45d6d0db99a3e15018064067a
2023-10-27 03:31:19 +00:00
Shivakumar Neginal
ad5bdd72ff Adding Fast Pair extended IDs for Pixel 6a
Adding the Fast Pair extended IDs for bluejay so that
    Quick Start shows the right Fast Pair bottom sheet on other devices
    during setup.

    Bug: 305516133
    Test: TBD
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:648307e16fe999eec1c83ab2df5bfa6364076216)
Merged-In: I852842706664902dc3a76175810ebf869439796d
Change-Id: I852842706664902dc3a76175810ebf869439796d
2023-10-27 03:31:11 +00:00
Lokesh Kumar Goel
be53203261 Update bluejay SVN to 51
Bug: 302612466
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d81b0b63f1806dbd9353d266dc0bab6a3e0549fd)
Merged-In: If8f16626a5e13f98e81ff0833a60888efe9cddcd
Change-Id: If8f16626a5e13f98e81ff0833a60888efe9cddcd
2023-10-27 03:31:04 +00:00
Roshan Pius
bb6c74b55e bluejay(nfc): Modify NFC overlays for NFC apex am: 37718485f2
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2804473

Change-Id: Ie270077019a977d62b50c2cd855eecefc2b18901
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 14:33:57 +00:00
Roshan Pius
37718485f2 bluejay(nfc): Modify NFC overlays for NFC apex
Bug: 307763519
Test: Manual flash and tested the overlay values are taking effect.
Change-Id: Ia8787c18a6eb3ff932a783cfcde6380f9937cd59
2023-10-25 14:06:47 -07:00
Xin Li
24cba1b02d Merge 10952656
Merged-In: I21193dd2a51d86c0c5ed04d48c188f906557be7c
Change-Id: Iffafbf45335d4af3635be599badc69f765b1320d
2023-10-17 10:05:54 -07:00
Android Build Coastguard Worker
24e2cccebc Merge cherrypicks of ['googleplex-android-review.googlesource.com/24895526'] into udc-qpr1-release.
Change-Id: Ica994201185611747baafb97a0da165c5fa5960c
2023-10-17 02:45:25 +00:00
Lokesh Kumar Goel
fa7a219cb4 Update bluejay SVN to 50
Bug: 302612466
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:9b309d763af958632045184fe493b6ed1d1510c2)
Merged-In: I7393253ef50c9b1da0f683ffcdd9cd191c8ab1f6
Change-Id: I7393253ef50c9b1da0f683ffcdd9cd191c8ab1f6
2023-10-17 02:40:49 +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
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
Xin Li
856bb61b7d Merge UP1A.231005.007
Bug: 291102124
Merged-In: Iecbf06a898f2c57da1ec29f6e5eb35241a3ec4f3
Change-Id: I2082f1cf1b4b9e607ff710b223552f66babbb122
2023-09-27 16:04:11 -07:00
Android Build Coastguard Worker
60c02ea00e Snap for 10832001 from dba182188e to udc-qpr1-release
Change-Id: I63c1d4d3e3ff10bb11440a82607a6043279b69ba
2023-09-19 23:02:25 +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
Android Build Coastguard Worker
1a15d43373 Snap for 10804332 from eb91bc0b4a to udc-qpr1-release
Change-Id: I8000cc50293c66f6f70199746bfba57f32faf2a3
2023-09-13 23:01: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
Android Build Coastguard Worker
864f7e2d26 Snap for 10791906 from 3b21269752 to udc-qpr1-release
Change-Id: I79a85229b555184caf4d27e4761d86f978179ede
2023-09-11 23:01:45 +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