Commit graph

2484 commits

Author SHA1 Message Date
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
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
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
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
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
Cole Faust
ab6e33ccea Use PRODUCT_COPY_FILES to install uwb country files am: 4e3ea6e815 am: 96d360a576 am: 337debd3fd am: 4d31ff02c2
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2777909

Change-Id: I220f48a43df9002d783951055ecc0e07427c7afa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-11 19:47:19 +00:00
Cole Faust
4d31ff02c2 Use PRODUCT_COPY_FILES to install uwb country files am: 4e3ea6e815 am: 96d360a576 am: 337debd3fd
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2777909

Change-Id: I6dcdc3421c8d445697781858e0184333adcac851
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-11 19:13:07 +00:00
Cole Faust
337debd3fd Use PRODUCT_COPY_FILES to install uwb country files am: 4e3ea6e815 am: 96d360a576
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2777909

Change-Id: I315544b444a54358c14d51f5310b1e7405a86cb2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-11 18:17:37 +00:00
Cole Faust
96d360a576 Use PRODUCT_COPY_FILES to install uwb country files am: 4e3ea6e815
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2777909

Change-Id: I614b9bbbaf2fad2a28a6f4f5182fc70b7f0421d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-11 17:45:51 +00:00
Cole Faust
4e3ea6e815 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: Id43164ae2a106d6d384cd90b2f4191e53b3d34da
2023-10-06 15:05:07 -07:00
Xin Li
fe8575d1cf [automerger skipped] Merge Android 14 am: 1fba35369d -s ours am: 5139499d27 -s ours am: 8a40eef5f4 -s ours am: 441255f85a -s ours
am skip reason: Merged-In Ia42c74a3fab73b984823796b61b0e66f7662ac53 with SHA-1 db6cb71439 is already in history

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

Change-Id: I7c3d75a86469da2657f69a42e7780ff3003a3624
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 11:00:49 +00:00
Xin Li
441255f85a [automerger skipped] Merge Android 14 am: 1fba35369d -s ours am: 5139499d27 -s ours am: 8a40eef5f4 -s ours
am skip reason: Merged-In Ia42c74a3fab73b984823796b61b0e66f7662ac53 with SHA-1 db6cb71439 is already in history

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

Change-Id: Id8a78439c2bc1fb54c693a6e7ee4e7a016e2ebe1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 09:50:59 +00:00
Xin Li
8a40eef5f4 [automerger skipped] Merge Android 14 am: 1fba35369d -s ours am: 5139499d27 -s ours
am skip reason: Merged-In Ia42c74a3fab73b984823796b61b0e66f7662ac53 with SHA-1 db6cb71439 is already in history

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

Change-Id: I2669428832c896012bbf2dcaceb950a69c9402f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 08:59:23 +00:00
Xin Li
5139499d27 [automerger skipped] Merge Android 14 am: 1fba35369d -s ours
am skip reason: Merged-In Ia42c74a3fab73b984823796b61b0e66f7662ac53 with SHA-1 db6cb71439 is already in history

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

Change-Id: I81d5e347e4cf057faa89f4158a437b4e089d79b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 07:52:18 +00:00
Xin Li
1fba35369d Merge Android 14
Bug: 298295554
Merged-In: Ia42c74a3fab73b984823796b61b0e66f7662ac53
Change-Id: I08cb8a2b2050c04b370de78fd0d422730cc60171
2023-10-05 15:33:08 -07:00
Xin Li
5dd8a3c959 [automerger skipped] Merge UP1A.231005.007 am: 08f3aa6503 -s ours am: 057645d3b3 -s ours am: c9449d8452 -s ours
am skip reason: Merged-In I8bd0f5ef94ca1d5e118a701a4cfff58599537476 with SHA-1 f538f8e771 is already in history

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

Change-Id: I71c4a1ccf0f3b80b7daffe538941a7b9750a81ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-29 09:04:30 +00:00
Xin Li
c9449d8452 [automerger skipped] Merge UP1A.231005.007 am: 08f3aa6503 -s ours am: 057645d3b3 -s ours
am skip reason: Merged-In I8bd0f5ef94ca1d5e118a701a4cfff58599537476 with SHA-1 f538f8e771 is already in history

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

Change-Id: I9237d98f2cef3b1b8473df6c2cda076e136fbe25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-29 08:16:27 +00:00
Xin Li
057645d3b3 [automerger skipped] Merge UP1A.231005.007 am: 08f3aa6503 -s ours
am skip reason: Merged-In I8bd0f5ef94ca1d5e118a701a4cfff58599537476 with SHA-1 f538f8e771 is already in history

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

Change-Id: Ief63652d08a62e5a17c4639a02af59a53483d5c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-29 07:15:38 +00:00
Lokesh Kumar Goel
348ba30559 Update felix SVN to 29
Bug: 302612466
Change-Id: Ia1f09da58824a8300e364bd3236fad0685ee5508
2023-09-29 01:15:53 +00:00
Lokesh Kumar Goel
0804c4be4d Update felix SVN to 28
Bug: 302612466
Change-Id: If52eb638b160fd202e0511f6213fa5c5bce4975e
2023-09-29 01:14:25 +00:00
Xin Li
08f3aa6503 Merge UP1A.231005.007
Bug: 291102124
Merged-In: I8bd0f5ef94ca1d5e118a701a4cfff58599537476
Change-Id: I218ff755949e928013808486639b33d81dde763b
2023-09-27 16:04:17 -07:00
Wilson Sung
5d4ec22ab3 Set the blew prebuilt apps to PRESIGNED am: db6cb71439 am: f05ee3a530 am: e54620d2a2
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24843850

Change-Id: I6c5cbf858264149dfd1586c6932b755903b6a4b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25 23:28:12 +00:00
Wilson Sung
e54620d2a2 Set the blew prebuilt apps to PRESIGNED am: db6cb71439 am: f05ee3a530
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24843850

Change-Id: I13f6533c404693a23e097f0aaa6b18394593e165
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25 22:47:04 +00:00
Wilson Sung
f05ee3a530 Set the blew prebuilt apps to PRESIGNED am: db6cb71439
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24843850

Change-Id: I012bdf5492f7b39fcee2bd4141731e2303abcb70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25 21:54:20 +00:00
Wilson Sung
db6cb71439 Set the blew prebuilt apps to PRESIGNED
Keep PixelQualifiedNetworksService platfrom key
Other apps are no need to re-sign

Bug: 290766628
Change-Id: Ia42c74a3fab73b984823796b61b0e66f7662ac53
2023-09-23 03:37:58 +00:00