Roshan Pius
552a0fd957
raviole(nfc): Modify NFC overlays for NFC apex am: 8c24309054
am: 29e36a79a1
...
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2803464
Change-Id: I395e48a2261f0210c20df750cee699484082ed9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 14:58:36 +00:00
Roshan Pius
2651fef279
raviole(nfc): Modify NFC overlays for NFC apex am: 8c24309054
am: b970e2c215
...
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2803464
Change-Id: I5ae50be69ab00b0bd8b118fc1ce617fc07967504
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 14:57:10 +00:00
Roshan Pius
29e36a79a1
raviole(nfc): Modify NFC overlays for NFC apex am: 8c24309054
...
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2803464
Change-Id: Ib183cae865d2235c17e94dc350010cdb69239442
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 14:35:52 +00:00
Roshan Pius
b970e2c215
raviole(nfc): Modify NFC overlays for NFC apex am: 8c24309054
...
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2803464
Change-Id: I5aa933d342b7192888bcff09d03a0522fe524f61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 14:33:57 +00:00
Greg Kaiser
08176b5882
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: I9778ab070155d18d4c67f31c9ff39863e7ba34af
2023-10-25 23:42:17 +00:00
Roshan Pius
8c24309054
raviole(nfc): Modify NFC overlays for NFC apex
...
Bug: 307763519
Test: Manual flash and tested the overlay values are taking effect.
Change-Id: I9a6de12915c42f22cca35543e665ff0a003938dd
2023-10-25 14:56:26 -07:00
Lokesh Kumar Goel
192c82f16e
Update oriole SVN to 72 am: e2f006d29c
am: 4380094579
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/24897202
Change-Id: I49e13f2674624643e31be4c136adf8ea61b5d99c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-25 21:10:33 +00:00
Lokesh Kumar Goel
ada7dc6cc5
Update raven SVN to 72 am: 09c3f8abaa
am: f6722a5530
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/24896788
Change-Id: Iefed649d7a338191a78a9f6209b6b5c2785b67db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-25 21:09:16 +00:00
Lokesh Kumar Goel
4380094579
Update oriole SVN to 72 am: e2f006d29c
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/24897202
Change-Id: Icb9a4ee8b040975099d2147c26356737c8095c16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-25 20:43:25 +00:00
Lokesh Kumar Goel
f6722a5530
Update raven SVN to 72 am: 09c3f8abaa
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/24896788
Change-Id: I00374bd61d44a643d47570d6d17e80bd1a662d5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-25 20:42:39 +00:00
Lokesh Kumar Goel
de8cd7d5e9
Update oriole SVN to 72
...
Bug: 302612466
Change-Id: I8dd3b2389683050f017bbc09946bce8a14e979e8
2023-10-25 20:20:23 +00:00
Lokesh Kumar Goel
c56cc1ffe2
Update raven SVN to 72
...
Bug: 302612466
Change-Id: I0d77e8c5e8878196f73fc0cb86406e0ff2bceecc
2023-10-25 20:20:23 +00:00
Lokesh Kumar Goel
91dbbaf6a2
Update raven SVN to 71
...
Bug: 302612466
Change-Id: I8c74f60d0c0437585a1f4bf5ad9d43115ddcc8b1
(cherry picked from commit ed76e2420d
)
2023-10-25 20:19:48 +00:00
Lokesh Kumar Goel
024c12af32
Update oriole SVN to 71
...
Bug: 302612466
Change-Id: If51fdd784e6f45e63331ce984e76632e2236a943
2023-10-25 19:47:18 +00:00
TeYuan Wang
cff140b5fd
thermal: align the setting VSKIN related sensors
...
Bug: 302435949
Test: emul_temp
Change-Id: Id2ea8911e577cab50b689223b2cc87cce512e23d
2023-10-20 12:06:08 -07:00
Xin Li
51b67a07be
[automerger skipped] Merge 10952656 am: 0f0c7de9a2
-s ours am: 00553ea6b1
-s ours
...
am skip reason: Merged-In I8634079aae9b1aba9b4399e19441301fbec6dbff with SHA-1 c55db3632b
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/25091722
Change-Id: I07546263d19b5b60d137a9f31bf0dc4c2ca535d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19 23:54:41 +00:00
Xin Li
00553ea6b1
[automerger skipped] Merge 10952656 am: 0f0c7de9a2
-s ours
...
am skip reason: Merged-In I8634079aae9b1aba9b4399e19441301fbec6dbff with SHA-1 c55db3632b
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/25091722
Change-Id: I30b0176c61f91ada43d18fbfa5632ce8d03fced5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19 18:47:55 +00:00
Xin Li
0f0c7de9a2
Merge 10952656
...
Merged-In: I8634079aae9b1aba9b4399e19441301fbec6dbff
Change-Id: I344475e7f406fd8607962b908625f08b7757777f
2023-10-17 10:06:50 -07:00
Android Build Coastguard Worker
5c0e5c8b0a
Merge cherrypicks of ['googleplex-android-review.googlesource.com/24895744', 'googleplex-android-review.googlesource.com/24896787'] into udc-qpr1-release.
...
Change-Id: I2b90d546895e80326e4e8c3e8737f71d059dae37
2023-10-17 02:45:35 +00:00
Lokesh Kumar Goel
dbd5573846
Update oriole SVN to 71
...
Bug: 302612466
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:afe27a01390a08b9904130e5eca9f554e5007b4d )
Merged-In: If51fdd784e6f45e63331ce984e76632e2236a943
Change-Id: If51fdd784e6f45e63331ce984e76632e2236a943
2023-10-17 02:41:51 +00:00
Lokesh Kumar Goel
5ace8cee54
Update raven SVN to 71
...
Bug: 302612466
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ed76e2420dfa185be32015c8c22d20cb58e1ced2 )
Merged-In: I8c74f60d0c0437585a1f4bf5ad9d43115ddcc8b1
Change-Id: I8c74f60d0c0437585a1f4bf5ad9d43115ddcc8b1
2023-10-17 02:41:44 +00:00
Roshan Pius
bea03a75c2
[automerger skipped] Merge "raven: Replace NFC app with NFC apex" into main am: 73a68dea0f
am: ebd3d3a0fd
am: 370433b1ea
am: fc36185f2e
am: 589d5a7a67
-s ours
...
am skip reason: Merged-In Ia234c14d666750f1c1dfeb22aa7f56fbd59593fa with SHA-1 95296f1873
is already in history
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2779334
Change-Id: I843a3da481b1b20f5a96077c81f4a21a8b904f9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-16 20:57:53 +00:00
Roshan Pius
589d5a7a67
Merge "raven: Replace NFC app with NFC apex" into main am: 73a68dea0f
am: ebd3d3a0fd
am: 370433b1ea
am: fc36185f2e
...
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2779334
Change-Id: I13cbb6edab48915c173fc94b3e8b8e247345fa3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-16 20:49:13 +00:00
Roshan Pius
fc36185f2e
Merge "raven: Replace NFC app with NFC apex" into main am: 73a68dea0f
am: ebd3d3a0fd
am: 370433b1ea
...
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2779334
Change-Id: I400bccc23a130c1413c0b9e5c192e4daf3feec4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-16 20:13:09 +00:00
Roshan Pius
370433b1ea
Merge "raven: Replace NFC app with NFC apex" into main am: 73a68dea0f
am: ebd3d3a0fd
...
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2779334
Change-Id: I774fbd8f8b90bc2305aa5f52c87e00632d3a9879
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-16 19:38:19 +00:00
Roshan Pius
ebd3d3a0fd
Merge "raven: Replace NFC app with NFC apex" into main am: 73a68dea0f
...
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2779334
Change-Id: I6b022030d5260f193c83edfc3b20b63a310515e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-16 19:15:54 +00:00
Roshan Pius
73a68dea0f
Merge "raven: Replace NFC app with NFC apex" into main
2023-10-16 18:31:02 +00:00
Lokesh Kumar Goel
7783dd6863
Update oriole SVN to 71 am: afe27a0139
am: 7dda9d5c84
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/24896787
Change-Id: I6a55ca9299174354196490b24940a57d6b26b12c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-16 05:35:35 +00:00
Lokesh Kumar Goel
5005834b64
Update raven SVN to 71 am: ed76e2420d
am: 98323c6c37
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/24895744
Change-Id: If13f043d8e672f2af3b895251f6933a11195f4ba
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
7dda9d5c84
Update oriole SVN to 71 am: afe27a0139
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/24896787
Change-Id: If4627a5c13057330d201d48e4be986d8c5fce0c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-16 05:04:34 +00:00
Lokesh Kumar Goel
98323c6c37
Update raven SVN to 71 am: ed76e2420d
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/24895744
Change-Id: If50e8e31c61da37e4074447c2ddb0007540fc1cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-16 05:04:25 +00:00
Roshan Pius
7ccd686ef7
raven: Replace NFC app with NFC apex
...
Bug: 303286040
Test: Compiles
Merged-In: Ia234c14d666750f1c1dfeb22aa7f56fbd59593fa
Change-Id: Ia234c14d666750f1c1dfeb22aa7f56fbd59593fa
2023-10-13 18:04:42 +00:00
guibing
53f15c8a4d
powerhint: raviole: 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: I2a3ca476354c0e920931749a285305f30f61d319
2023-10-13 17:19:09 +00:00
Roshan Pius
95296f1873
raven: Replace NFC app with NFC apex
...
Bug: 303286040
Test: Compiles
(cherry picked from https://android-review.googlesource.com/q/commit:ba50cdd59a167ff3168129e321fad4a95a8888ef )
Merged-In: Ia234c14d666750f1c1dfeb22aa7f56fbd59593fa
Change-Id: Ia234c14d666750f1c1dfeb22aa7f56fbd59593fa
2023-10-13 14:11:35 +00:00
Cole Faust
707d6fe29a
Use PRODUCT_COPY_FILES to install uwb country files am: 4a96299e45
am: 43028647c5
am: d82fee1e4b
am: 1f294e4bcf
am: c55db3632b
...
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2776726
Change-Id: I91c1d814694a12380e2a1f7be672f9f74070ca3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-11 20:20:18 +00:00
Cole Faust
c55db3632b
Use PRODUCT_COPY_FILES to install uwb country files am: 4a96299e45
am: 43028647c5
am: d82fee1e4b
am: 1f294e4bcf
...
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2776726
Change-Id: I8634079aae9b1aba9b4399e19441301fbec6dbff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-11 19:47:19 +00:00
Cole Faust
1f294e4bcf
Use PRODUCT_COPY_FILES to install uwb country files am: 4a96299e45
am: 43028647c5
am: d82fee1e4b
...
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2776726
Change-Id: I0da0265f657826eee8f0724660ef0d59962f60aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-11 19:13:07 +00:00
Cole Faust
d82fee1e4b
Use PRODUCT_COPY_FILES to install uwb country files am: 4a96299e45
am: 43028647c5
...
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2776726
Change-Id: I31aa0813f3c5b2cbdf3d33c62583f4fd395109d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-11 18:17:37 +00:00
Cole Faust
43028647c5
Use PRODUCT_COPY_FILES to install uwb country files am: 4a96299e45
...
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2776726
Change-Id: Id38841d95d113621bb46f72da01707318847588e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-11 17:45:52 +00:00
Cole Faust
4a96299e45
Use PRODUCT_COPY_FILES to install uwb country files
...
Previously, these files were installed with a custom $(shell) command
in an Android.mk file. This doesn't let the build system know that
these files exist, and breaks hermetic partition builds.
Instead, install them with PRODUCT_COPY_FILES, and add a check that
the list is up-to-date.
Bug: 205632228
Test: Presubmits
Change-Id: Ib1b1bddd440f6e36daf81da6e51b42706c098ee8
2023-10-10 23:17:46 -07:00
Xin Li
57bf64f150
[automerger skipped] Merge Android 14 am: 90d20c3c3d
-s ours am: 0a394d0d24
-s ours am: 7aa52b6271
-s ours am: c3ba097cf2
-s ours am: 00538e9ec0
-s ours
...
am skip reason: Merged-In I7bb05c1f0057a15ff76b14af6a7d6390cf5f1fb0 with SHA-1 3aae814a0e
is already in history
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2776403
Change-Id: Ie234c21a8e4955f7c47ee349c844fc37fb7b4f5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-07 00:19:50 +00:00
Xin Li
00538e9ec0
[automerger skipped] Merge Android 14 am: 90d20c3c3d
-s ours am: 0a394d0d24
-s ours am: 7aa52b6271
-s ours am: c3ba097cf2
-s ours
...
am skip reason: Merged-In I7bb05c1f0057a15ff76b14af6a7d6390cf5f1fb0 with SHA-1 3aae814a0e
is already in history
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2776403
Change-Id: Ie03bf89ff9223f4a3b92eb96cccba518034781d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 11:00:19 +00:00
Xin Li
c3ba097cf2
[automerger skipped] Merge Android 14 am: 90d20c3c3d
-s ours am: 0a394d0d24
-s ours am: 7aa52b6271
-s ours
...
am skip reason: Merged-In I7bb05c1f0057a15ff76b14af6a7d6390cf5f1fb0 with SHA-1 3aae814a0e
is already in history
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2776403
Change-Id: I74843d59a0488ac63facf1e866a8a1e43ac9ffc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 09:50:28 +00:00
Xin Li
7aa52b6271
[automerger skipped] Merge Android 14 am: 90d20c3c3d
-s ours am: 0a394d0d24
-s ours
...
am skip reason: Merged-In I7bb05c1f0057a15ff76b14af6a7d6390cf5f1fb0 with SHA-1 3aae814a0e
is already in history
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2776403
Change-Id: Icfac6e733f0e2d25ac21d904684dd282dfc3c208
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 08:58:52 +00:00
Xin Li
0a394d0d24
[automerger skipped] Merge Android 14 am: 90d20c3c3d
-s ours
...
am skip reason: Merged-In I7bb05c1f0057a15ff76b14af6a7d6390cf5f1fb0 with SHA-1 3aae814a0e
is already in history
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2776403
Change-Id: I2810332c53478734d2d26d096a99c70f0d78ff6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 07:51:48 +00:00
Xin Li
90d20c3c3d
Merge Android 14
...
Bug: 298295554
Merged-In: I7bb05c1f0057a15ff76b14af6a7d6390cf5f1fb0
Change-Id: Ic67ade7189c892e7e8348a63c42c846b06ba651c
2023-10-05 15:34:26 -07:00
ClintChen
12bb201d03
oriole: Enable build flag versioning for radio and bootloader
...
Bug: 301142125
Change-Id: I943612ca22a468470b1ed739c032c89c63e793ae
2023-10-04 09:21:36 +00:00
Jimmy Shiu
50e640cbe0
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: Ifaca5cac8320e08790eed27a5c7121c60901f26e
2023-10-03 14:57:34 +00:00
Xin Li
f1bb202bd8
[automerger skipped] Merge UP1A.231005.007 am: 22375460cc
-s ours am: dc619d507b
-s ours am: 2281574622
-s ours am: 20e2e948b7
-s ours
...
am skip reason: Merged-In I073e25b8e4db19f9680e4ef7cda6baa7c265b925 with SHA-1 0f47de1ea2
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/24879262
Change-Id: I9c41139c9c0686adb4dabba08f432c51ce6c2a2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-29 10:20:34 +00:00
Xin Li
20e2e948b7
[automerger skipped] Merge UP1A.231005.007 am: 22375460cc
-s ours am: dc619d507b
-s ours am: 2281574622
-s ours
...
am skip reason: Merged-In I073e25b8e4db19f9680e4ef7cda6baa7c265b925 with SHA-1 0f47de1ea2
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/24879262
Change-Id: Ib96f5f0b14ec707644e37b62ece5d564115b0374
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-29 09:04:34 +00:00