Lokesh Kumar Goel
f05ecce84e
Update felix SVN to 29 am: 0c650e810d
am: 6c0822bd46
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25176955
Change-Id: Id9070f1df4dfd3fde396385d511ec9493528c5b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 21:24:39 +00:00
Lokesh Kumar Goel
b5a77f9e0e
[automerger skipped] Update felix SVN to 28 am: 8ad0e2cf93
am: 1a04115be1
-s ours
...
am skip reason: skipped by user lokeshgoel
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25176953
Change-Id: I5767a29210c88b93732ee40485e887b4af7b129e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 21:24:00 +00:00
Lokesh Kumar Goel
6c0822bd46
Update felix SVN to 29 am: 0c650e810d
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25176955
Change-Id: Ifc0bf65b9c40d3c33f9a5ad89e528302e5f1a867
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 19:06:23 +00:00
Lokesh Kumar Goel
1a04115be1
Update felix SVN to 28 am: 8ad0e2cf93
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25176953
Change-Id: I3b0fcc12c696fa5cd9dc9a24c920f5408daacb2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 19:05:57 +00:00
Lokesh Kumar Goel
0d2a8a6942
Update felix SVN to 29 am: 0c650e810d
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25176955
Change-Id: Ibee3ac7d7f77fe5a0fcb1fbcb70eedf77e89077e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 19:04:37 +00:00
Lokesh Kumar Goel
67a29b5bb5
Update felix SVN to 28 am: 8ad0e2cf93
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25176953
Change-Id: I673c1f3597ded272c39ba245139107f458ac5658
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 19:04:07 +00:00
Lokesh Kumar Goel
d0e0bcb6a5
Update felix SVN to 29 am: 0c650e810d
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25176955
Change-Id: I0d1ff11bb8df3420779c97aba049991d2448cc6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 19:03:52 +00:00
Lokesh Kumar Goel
446501afd9
Update felix SVN to 28 am: 8ad0e2cf93
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25176953
Change-Id: Iecdf4d01252fd905bfb2e31b953753d727d2bc0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 19:03:26 +00:00
Roshan Pius
98e8df30b7
felix(nfc): Modify NFC overlays for NFC apex am: 422f737c4b
am: fa6eb11ca3
am: 6dc47683b7
...
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2804475
Change-Id: I2055ba3a83701e572287820a508fb16f99bf5708
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 15:30:21 +00:00
Roshan Pius
f7dae2aa9d
felix(nfc): Modify NFC overlays for NFC apex am: 422f737c4b
am: 0d481cf369
am: 445c61a269
...
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2804475
Change-Id: I84a650d23e538b51152760d4d920f604b399208e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 15:29:06 +00:00
Roshan Pius
6dc47683b7
felix(nfc): Modify NFC overlays for NFC apex am: 422f737c4b
am: fa6eb11ca3
...
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2804475
Change-Id: I571df442ff7ad7e87134b63863e7b53a0517b88e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 14:58:35 +00:00
Roshan Pius
445c61a269
felix(nfc): Modify NFC overlays for NFC apex am: 422f737c4b
am: 0d481cf369
...
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2804475
Change-Id: Id71e1b49954336818bd05ab7bb78694ee5649257
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 14:57:08 +00:00
Roshan Pius
fa6eb11ca3
felix(nfc): Modify NFC overlays for NFC apex am: 422f737c4b
...
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2804475
Change-Id: Ia605f593c54e5942fa7d9a842dcdd1836614ca3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 14:35:52 +00:00
Roshan Pius
0d481cf369
felix(nfc): Modify NFC overlays for NFC apex am: 422f737c4b
...
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2804475
Change-Id: Ifc7551059829f274a7dd34e8a97e5975aeae61b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 14:33:56 +00:00
Ankur Bakshi
acd9c7a658
Update felix SVN to 30
...
Bug: 302612466
Change-Id: Idf4b4f1f1f14b86b3205ba8249e0aeb0fb377359
2023-10-26 05:24:05 +00:00
Roshan Pius
422f737c4b
felix(nfc): Modify NFC overlays for NFC apex
...
Bug: 307763519
Test: Manual flash and tested the overlay values are taking effect.
Change-Id: I4c02990bf44fb5f8de360572f1b15ae6f70520ff
2023-10-26 04:06:11 +00:00
Treehugger Robot
27f4abdff0
Merge "Fix lunch choices for git_main" into main
2023-10-25 23:44:17 +00:00
Greg Kaiser
2d13c2fd2b
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: I441fde351191dfa28e48a54538249be57310971f
2023-10-25 15:35:41 -06:00
Lokesh Kumar Goel
f88a11aeaa
Update felix SVN to 29 am: 348ba30559
am: 32587a4efe
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24896431
Change-Id: Icdbb09445f6fd18e697d40f4b9fc026b31265ec4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-25 21:10:05 +00:00
Lokesh Kumar Goel
32587a4efe
Update felix SVN to 29 am: 348ba30559
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24896431
Change-Id: Idd044f1fe6aa43b11dfcb0f35b783cadbd97cb7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-25 20:42:53 +00:00
Lokesh Kumar Goel
0c650e810d
Update felix SVN to 29
...
Bug: 302612466
Change-Id: Ia1f09da58824a8300e364bd3236fad0685ee5508
2023-10-25 20:29:36 +00:00
Lokesh Kumar Goel
8ad0e2cf93
Update felix SVN to 28
...
Bug: 302612466
Change-Id: If52eb638b160fd202e0511f6213fa5c5bce4975e
2023-10-25 19:47:19 +00:00
Cyan_Hsieh
0dd2f0fc9c
Split bootloader prebuilt to 24Q1 and trunk version
...
Bug: 299879102
Change-Id: I9c28b2dac2515657ec1ca4b2e252024de91319cf
2023-10-24 16:41:04 +08:00
Treehugger Robot
70f71facd1
Merge "Update IDisplay to V10" into main
2023-10-24 02:40:50 +00:00
Chris Paulo
3f346b4849
felix/vibrator: Update durations to match other projects
...
Updated the duration of effects to match waveform durations. This will
remove the added overhead durations which are not supposed to be part of
the calculations for durations of effects.
Bug: 305756647
Test: atest VibratorHalCs40l26TestSuitePrivate
Change-Id: I66c761482b13969816630e89b9e79cfb729f6f5c
Signed-off-by: Chris Paulo <chrispaulo@google.com>
2023-10-20 15:04:43 -07:00
Treehugger Robot
c5697205e7
Merge "Update SELinux error" into main
2023-10-20 13:16:59 +00:00
Cheng Chang
3cd8690bf5
gps: Enable Vzw SUPL OTDOA
...
Bug: 303401506
Test: OTDOA test in b/303401506
Change-Id: I53bce7feff22c39c5a787fda1be3218a0f51e4b1
2023-10-20 03:38:40 +00:00
Xin Li
548a10db7f
[automerger skipped] Merge 10952656 am: aca659d22b
-s ours am: 17abad99d1
-s ours
...
am skip reason: Merged-In I220f48a43df9002d783951055ecc0e07427c7afa with SHA-1 ab6e33ccea
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25093005
Change-Id: I91c3146f40c1ecfe7874d5870df7002c9bb567ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19 23:54:33 +00:00
Xin Li
bb4cd66700
[automerger skipped] Merge 10952656 am: bf9b89a17e
-s ours am: e8c0aa94ed
-s ours
...
am skip reason: Merged-In Ic35032349ac6c8668a5aca48f95b0b9b09fd4931 with SHA-1 c7f972b65d
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix-sepolicy/+/25089592
Change-Id: I8688ef8e0e8fb04a6279763208b66b5332554e8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19 23:54:26 +00:00
Xin Li
17abad99d1
[automerger skipped] Merge 10952656 am: aca659d22b
-s ours
...
am skip reason: Merged-In I220f48a43df9002d783951055ecc0e07427c7afa with SHA-1 ab6e33ccea
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25093005
Change-Id: I0ee4481c1a329fc2ceb3bba1f32a0dbc05ff13b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19 18:47:47 +00:00
Xin Li
e8c0aa94ed
[automerger skipped] Merge 10952656 am: bf9b89a17e
-s ours
...
am skip reason: Merged-In Ic35032349ac6c8668a5aca48f95b0b9b09fd4931 with SHA-1 c7f972b65d
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix-sepolicy/+/25089592
Change-Id: Ib3fddbac3d6ae12498cd923742a3198969b5e741
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19 18:47:41 +00:00
Wilson Sung
fe45ceb4ef
Update SELinux error
...
Test: SELinuxUncheckedDenialBootTest
Bug: 306344097
Test: scanBugreport
Bug: 305600372
Test: scanAvcDeniedLogRightAfterReboot
Bug: 305600372
Change-Id: I6cf8988e22bbbcac11a8b195f00021c0920f7e6d
2023-10-19 11:06:20 +00:00
Xin Li
bf9b89a17e
Merge 10952656
...
Merged-In: Ic35032349ac6c8668a5aca48f95b0b9b09fd4931
Change-Id: I92b1361b9833dcf97f0eb37ad65b8c85b048d24a
2023-10-17 10:06:29 -07:00
Xin Li
aca659d22b
Merge 10952656
...
Merged-In: I220f48a43df9002d783951055ecc0e07427c7afa
Change-Id: I05ee5b22c2850b609c38c88da98dfcaff66e128f
2023-10-17 10:06:18 -07:00
Android Build Coastguard Worker
3a08687c0f
Merge cherrypicks of ['googleplex-android-review.googlesource.com/24896430'] into udc-qpr1-release.
...
Change-Id: I6b4ad117155e876daf81df0d93cad19dab9ef126
2023-10-17 02:45:27 +00:00
Lokesh Kumar Goel
f5a0584db7
Update felix SVN to 28
...
Bug: 302612466
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:0804c4be4d794661f56a24f23970c05a3b671097 )
Merged-In: If52eb638b160fd202e0511f6213fa5c5bce4975e
Change-Id: If52eb638b160fd202e0511f6213fa5c5bce4975e
2023-10-17 02:41:02 +00:00
Roshan Pius
daf56acf59
[automerger skipped] Merge "felix: Replace NFC app with NFC apex" into main am: 996129be91
am: cda6224f59
am: 48ee029a6f
am: de798f7fd9
am: d2e0ca217b
-s ours
...
am skip reason: Merged-In I9ae8d7630d18075b8620997582761787af1a65b4 with SHA-1 19bacab2ca
is already in history
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2779568
Change-Id: I5f757dcfd8456a74fc6f30d01c48e9c4a1fe90b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-16 20:57:52 +00:00
Roshan Pius
d2e0ca217b
Merge "felix: Replace NFC app with NFC apex" into main am: 996129be91
am: cda6224f59
am: 48ee029a6f
am: de798f7fd9
...
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2779568
Change-Id: If6ec3a2b5344d42b0146dd3e8c91c8174a68419e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-16 20:49:12 +00:00
Shivakumar Neginal
9931ca082a
Adding Fast Pair extended IDs for F10
...
Adding the Fast Pair extended IDs for felix so that
Quick Start shows the right Fast Pair bottom sheet on other devices
during setup.
Bug: 305516133
Test: TBD
Change-Id: Iec1e7b85e802e55b204d0bebfaf9c2f83ca588f2
2023-10-16 20:33:38 +00:00
Roshan Pius
de798f7fd9
Merge "felix: Replace NFC app with NFC apex" into main am: 996129be91
am: cda6224f59
am: 48ee029a6f
...
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2779568
Change-Id: I49b935fc77091d1f868ea79bf69e16fee8e307b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-16 20:13:08 +00:00
Roshan Pius
48ee029a6f
Merge "felix: Replace NFC app with NFC apex" into main am: 996129be91
am: cda6224f59
...
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2779568
Change-Id: Ide3300b576b6a5d2f12829338ea914f76d18dc04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-16 19:38:17 +00:00
Roshan Pius
cda6224f59
Merge "felix: Replace NFC app with NFC apex" into main am: 996129be91
...
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2779568
Change-Id: I85de99093656327267c1fd25539a4c4b227f7104
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-16 19:15:53 +00:00
Roshan Pius
996129be91
Merge "felix: Replace NFC app with NFC apex" into main
2023-10-16 18:31:03 +00:00
Wilson Sung
1cac1ae708
Update SELinux error
...
Test: SELinuxUncheckedDenialBootTest
Bug: 305600843
Bug: 305600734
Bug: 305600372
Change-Id: I5c54a0938e80236853048948eeb380c5b1409b9e
2023-10-16 05:39:05 +00:00
Lokesh Kumar Goel
325247424b
Update felix SVN to 28 am: 0804c4be4d
am: 07ef905d8b
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24896430
Change-Id: I14d9161fef8cd9eb3d0ff0b51a4c6913dc78c7ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-16 05:35:25 +00:00
Lokesh Kumar Goel
07ef905d8b
Update felix SVN to 28 am: 0804c4be4d
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24896430
Change-Id: I2d9cea545cecde60e8241155014e2dfa6e6bccab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-16 05:04:25 +00:00
Alice Kuo
49c941fb4a
Merge "Add LE Audio allow list candidate device" into main
2023-10-14 09:00:00 +00:00
Roshan Pius
4e94c7642a
felix: Replace NFC app with NFC apex
...
Bug: 303286040
Test: Compiles
Merged-In: I9ae8d7630d18075b8620997582761787af1a65b4
Change-Id: I9ae8d7630d18075b8620997582761787af1a65b4
2023-10-13 18:05:54 +00:00
Guibing Cai
dd35af65b3
Merge "powerhint: felix: update vendor_sched procfs paths" into main
2023-10-13 17:18:27 +00:00
Roshan Pius
cd1582228c
Merge "felix: Replace NFC app with NFC apex" into main
2023-10-13 14:12:07 +00:00