Commit graph

2512 commits

Author SHA1 Message Date
Herbert Xue
4e93f60c8f Remove unused Android.mk under device/google/felix am: 1890f3cb8b am: 905e71e645
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2835912

Change-Id: I3a39eec5e7136ace54e6cc4f137011ee5678e3ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-20 03:55:01 +00:00
Herbert Xue
905e71e645 Remove unused Android.mk under device/google/felix am: 1890f3cb8b
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2835912

Change-Id: Ia2da9795fd437e3ed81b45730f9163391017f2f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-20 03:23:53 +00:00
Herbert Xue
1890f3cb8b Remove unused Android.mk under device/google/felix
Bug: 311516793
Test: NA
Change-Id: Ic22d3796ae71a86e6ea2a0a732603bb505b84fab
2023-11-17 11:40:58 +08:00
Ankur Bakshi
3f165557b8 Update felix SVN to 33 am: faf934e258
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25365247

Change-Id: I5368e35b8ffdb22c58d9c2caee8198b57240c9f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16 21:35:15 +00:00
Ankur Bakshi
84b4c53f2e Update felix SVN to 32 am: fbb91bcaa4
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25343626

Change-Id: Ib210a8a5abdd5e3b60df24558293f6c719df5e2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16 04:28:59 +00:00
Ankur Bakshi
faf934e258 Update felix SVN to 33
Bug: 309529736
Change-Id: Ic9fcbd860c7882a10f49123e931799a81a6fc059
2023-11-14 04:03:22 +00:00
Ankur Bakshi
fbb91bcaa4 Update felix SVN to 32
Bug: 309529736
Change-Id: I848a8e5489e68040ae10ec18760497a6c6a86500
2023-11-11 02:32:11 +00:00
Ankur Bakshi
03e4dfdb9b Update felix SVN to 31 am: 55b74d41e9
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25293153

Change-Id: Ic0969e706d861cc474c41220068a8b9a841ca44f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-11 01:39:01 +00:00
Ankur Bakshi
55b74d41e9 Update felix SVN to 31
Bug: 302612466
Change-Id: Id914c4cfcb72b896b750446b663bd9e2be43e34e
2023-11-10 23:15:11 +00:00
Roshan Pius
5212a1d557 Merge changes from topic "nfc_apex_revert" into main am: 4bc515224b am: 9592292e98
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2817310

Change-Id: I067d5c92de21e61324d3b44b8e72873933f442cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 22:48:53 +00:00
Roshan Pius
36e918a183 Revert "felix(nfc): Modify NFC overlays for NFC apex" am: 98699d7fb9 am: 20494a566f
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2818128

Change-Id: Ice9e7b7eede7c2af4b4aba9541e420fe1b57425e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 22:48:38 +00:00
Roshan Pius
bfca1a6f59 Merge changes from topic "nfc_apex_revert" into main am: 4bc515224b am: f94b13f69d
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2817310

Change-Id: Idcbbf3af8d330170c9953a28a74987b8a0c1c43c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 22:46:09 +00:00
Roshan Pius
72c38dc683 Revert "felix(nfc): Modify NFC overlays for NFC apex" am: 98699d7fb9 am: 1cabb5c5a8
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2818128

Change-Id: If7429732d051c55246986f6c3639a35991cea7a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 22:46:03 +00:00
Roshan Pius
9592292e98 Merge changes from topic "nfc_apex_revert" into main am: 4bc515224b
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2817310

Change-Id: If1f2f8599e26dea854aa515568430001f7a77699
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 21:49:01 +00:00
Roshan Pius
20494a566f Revert "felix(nfc): Modify NFC overlays for NFC apex" am: 98699d7fb9
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2818128

Change-Id: If410b9437051e4281818fc444d433234f12707da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 21:48:51 +00:00
Roshan Pius
f94b13f69d Merge changes from topic "nfc_apex_revert" into main am: 4bc515224b
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2817310

Change-Id: I0a1af4db29e0c8d1c596572f6346e808a8e31716
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 21:45:30 +00:00
Roshan Pius
1cabb5c5a8 Revert "felix(nfc): Modify NFC overlays for NFC apex" am: 98699d7fb9
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2818128

Change-Id: Ib829c4d8b660a795d38ca72ba71556a2732c291d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 21:45:23 +00:00
Roshan Pius
4bc515224b Merge changes from topic "nfc_apex_revert" into main
* changes:
  Revert "felix: Replace NFC app with NFC apex"
  Revert "felix(nfc): Modify NFC overlays for NFC apex"
2023-11-08 21:16:20 +00:00
Roshan Pius
7091f06342 Revert "felix: 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:09c1ce320b7948c069bc48645b90eb55cae2bd3e)
Merged-In: Ib09ea604351cea2c4ed40e64c0bf783a666eb08b
Change-Id: Ib09ea604351cea2c4ed40e64c0bf783a666eb08b
2023-11-07 06:11:02 +00:00
Roshan Pius
98699d7fb9 Revert "felix(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: Ic36d5e92cb4dd5b842cbf0d5de81a0548d63c77f
Change-Id: Ic36d5e92cb4dd5b842cbf0d5de81a0548d63c77f
2023-11-06 19:45:22 +00:00
Greg Kaiser
14776220a7 [automerger skipped] Fix lunch choices for git_main am: eecbe76392 am: 7a361e0fde -s ours
am skip reason: Merged-In I441fde351191dfa28e48a54538249be57310971f with SHA-1 eecbe76392 is already in history

Original change: https://android-review.googlesource.com/c/device/google/felix/+/2809728

Change-Id: Ia82b990136329eb125d8e8fab292507c671ad4fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-31 00:06:42 +00:00
Greg Kaiser
7a361e0fde Fix lunch choices for git_main am: eecbe76392
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2809728

Change-Id: Iff4614a102fb82f92203b7838976577554f4c055
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-30 23:42:15 +00:00
Greg Kaiser
152117510d Fix lunch choices for git_main am: eecbe76392 am: e1145ed773
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2809728

Change-Id: I442166cfcb7e3855ec38d2524cf5fb6cfe95049b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-30 23:37:19 +00:00
Greg Kaiser
e1145ed773 Fix lunch choices for git_main am: eecbe76392
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2809728

Change-Id: I5272a3c8c148b21b0a6e835d0653367349b3cb9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-30 23:10:18 +00:00
Greg Kaiser
eecbe76392 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:2d13c2fd2bbc1164beca59490ca0f1c88c25a256)
Merged-In: I441fde351191dfa28e48a54538249be57310971f
Change-Id: I441fde351191dfa28e48a54538249be57310971f
2023-10-30 22:00:32 +00:00
Treehugger Robot
e3dc31a837 Merge "Update felix SVN to 30" into udc-qpr-dev am: 191a8f3462
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25181894

Change-Id: I6750b4258a5a09ccd204444124d714889e8c8b9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-27 02:18:52 +00:00
Treehugger Robot
191a8f3462 Merge "Update felix SVN to 30" into udc-qpr-dev 2023-10-27 01:46:44 +00:00
Treehugger Robot
56658f374e Merge " Adding Fast Pair extended IDs for F10" into udc-qpr-dev am: fb7ad6b67f
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25063890

Change-Id: I31f08ca225e90d7f5cc32d01853ea3ea7904513d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 23:21:16 +00:00
Treehugger Robot
fb7ad6b67f Merge " Adding Fast Pair extended IDs for F10" into udc-qpr-dev 2023-10-26 22:56:18 +00:00
Lokesh Kumar Goel
c5b3e5b272 Update felix SVN to 29 am: 0c650e810d am: 6c0822bd46 am: f05ecce84e
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25176955

Change-Id: I0ace5e027ccb00c9cf4af9c0d1964e628e886cae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 21:55:29 +00:00
Lokesh Kumar Goel
dc93f0b997 [automerger skipped] Update felix SVN to 28 am: 8ad0e2cf93 am: 1a04115be1 -s ours am: b5a77f9e0e -s ours
am skip reason: skipped by user lokeshgoel

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

Change-Id: Ic98a437f40559fbd717abdfa06c0fa11ce3ffafa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 21:54:57 +00:00
Lokesh Kumar Goel
9ac8802a3a Update felix SVN to 29 am: 0c650e810d am: d0e0bcb6a5
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25176955

Change-Id: I04762a206bec1da5212c147a94cec0c69f756326
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 21:33:14 +00:00
Lokesh Kumar Goel
0dff87e435 [automerger skipped] Update felix SVN to 28 am: 8ad0e2cf93 am: 446501afd9 -s ours
am skip reason: skipped by user lokeshgoel

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

Change-Id: I5f22073a07063dd1f839f6d9e939e5f8bfb61a56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 21:32:35 +00:00
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
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
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
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
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
aca659d22b Merge 10952656
Merged-In: I220f48a43df9002d783951055ecc0e07427c7afa
Change-Id: I05ee5b22c2850b609c38c88da98dfcaff66e128f
2023-10-17 10:06:18 -07:00