Commit graph

441 commits

Author SHA1 Message Date
Ankur Bakshi
59bcdfbd32 Update felix SVN to 31 am: 55b74d41e9 am: 03e4dfdb9b
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25293153

Change-Id: I9672a948af23cc7618fdb7605f3c98a2ab517482
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-11 02:10:29 +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
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
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
Poomarin Phloyphisut
e32682b14c [CCA] Set enable flag by default on Felix.
Bug: 309566086
Test: N/A
Change-Id: Ibf847c16f69d8606b2fec8fe82930a7149632290
2023-11-07 07:01:15 +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
Roshan Pius
8296448354 Merge "Revert "felix: Replace NFC app with NFC apex"" into main 2023-11-06 14:31:02 +00:00
Roshan Pius
e274b4177a 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
(cherry picked from https://android-review.googlesource.com/q/commit:9b9ed35e2791458c36b792ee049972c978b75606)
Merged-In: Ic36d5e92cb4dd5b842cbf0d5de81a0548d63c77f
Change-Id: Ic36d5e92cb4dd5b842cbf0d5de81a0548d63c77f
2023-11-04 19:04:38 +00:00
Roshan Pius
09c1ce320b 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
Change-Id: Ib09ea604351cea2c4ed40e64c0bf783a666eb08b
Test: Compiles, device boots up
2023-11-04 14:59:04 +00:00
Shin-Yu Wang
099bd7fd13 Update idle timer setting
Bug: 308140167
Test: check result of `adb shell getprop ro.surface_flinger.set_idle_timer_ms`
Change-Id: I873e69c385d787567a14427c007fa834c1a66062
2023-10-30 14:45:56 +00:00
Ankur Bakshi
dffbdd0b0f Update felix SVN to 30
Bug: 302612466
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:acd9c7a658123df92ee49b358b01bc5811911905)
Merged-In: Idf4b4f1f1f14b86b3205ba8249e0aeb0fb377359
Change-Id: Idf4b4f1f1f14b86b3205ba8249e0aeb0fb377359
2023-10-27 03:31:44 +00:00
Shivakumar Neginal
403b895a06 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
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:9931ca082a643bd498f22cfa59d4d7954bce6e63)
Merged-In: Iec1e7b85e802e55b204d0bebfaf9c2f83ca588f2
Change-Id: Iec1e7b85e802e55b204d0bebfaf9c2f83ca588f2
2023-10-27 03:31:35 +00:00
Lokesh Kumar Goel
aa4d849349 Update felix SVN to 29
Bug: 302612466
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:0c650e810d598f67b21cb0f862c12c1d4fd68490)
Merged-In: Ia1f09da58824a8300e364bd3236fad0685ee5508
Change-Id: Ia1f09da58824a8300e364bd3236fad0685ee5508
2023-10-27 03:31:26 +00:00
Cyan Hsieh
684f06aee3 Merge "Split bootloader prebuilt to 24Q1 and trunk version" into main 2023-10-27 03:04:52 +00:00
Treehugger Robot
3292ed70fa Merge "Update felix SVN to 30" into udc-qpr-dev am: 191a8f3462 am: e3dc31a837
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25181894

Change-Id: I2fcb6f1af1f25afdf69e0fc5e7e15149d384d220
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-27 02:49:48 +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
125b612cb9 Merge " Adding Fast Pair extended IDs for F10" into udc-qpr-dev am: fb7ad6b67f am: 56658f374e
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25063890

Change-Id: I59c11f6a03a8886b70b208bc7069a856e68b7834
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 23:50:53 +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
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
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
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
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
Cyan_Hsieh
0dd2f0fc9c Split bootloader prebuilt to 24Q1 and trunk version
Bug: 299879102
Change-Id: I9c28b2dac2515657ec1ca4b2e252024de91319cf
2023-10-24 16:41:04 +08:00
Xin Li
aca659d22b Merge 10952656
Merged-In: I220f48a43df9002d783951055ecc0e07427c7afa
Change-Id: I05ee5b22c2850b609c38c88da98dfcaff66e128f
2023-10-17 10:06:18 -07: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
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
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
996129be91 Merge "felix: Replace NFC app with NFC apex" into main 2023-10-16 18:31:03 +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
Roshan Pius
cd1582228c Merge "felix: Replace NFC app with NFC apex" into main 2023-10-13 14:12:07 +00:00
Cole Faust
58596729eb Use PRODUCT_COPY_FILES to install uwb country files am: 4e3ea6e815 am: 96d360a576 am: 337debd3fd am: 4d31ff02c2 am: ab6e33ccea
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2777909

Change-Id: I5880d29890dcc3c061f5bce8ae7f346642160fdd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-11 20:20:18 +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
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
Alice Kuo
7545c3acd7 Add LE Audio allow list candidate device
Bug: 300012501
Test: manual test
Change-Id: I4833f33738899bba31158d0d6fbd43d9e3cd9f5e
2023-10-11 14:18:05 +08:00
Roshan Pius
19bacab2ca felix: Replace NFC app with NFC apex
Bug: 303286040
Test: Compiles
(cherry picked from https://android-review.googlesource.com/q/commit:ca8ad36fe840ab900fdd4bebdcf787b9463a3614)
Merged-In: I9ae8d7630d18075b8620997582761787af1a65b4
Change-Id: I9ae8d7630d18075b8620997582761787af1a65b4
2023-10-09 19:56:23 +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
Lokesh Kumar Goel
348ba30559 Update felix SVN to 29
Bug: 302612466
Change-Id: Ia1f09da58824a8300e364bd3236fad0685ee5508
2023-09-29 01:15:53 +00:00