Commit graph

3377 commits

Author SHA1 Message Date
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
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
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
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
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
Leo Chen
982803b81f Update IDisplay to V10
Test: Build pass
Bug: 299410182
Change-Id: I3d368dab1fde2f9cf5d4dea6730f28d45dfacc4f
Signed-off-by: Leo Chen <yinchiuan@google.com>
2023-10-12 07:48:25 +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
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
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
Jenny Ho
977f2468ab Add permission for dual battery stats
Bug: 293523710
Change-Id: I0ceca5cab49528110a21e486929c4ec20d1be58f
Signed-off-by: Jenny Ho <hsiufangho@google.com>
2023-10-11 00:43:49 +00:00
guibing
806d6a25f1 powerhint: felix: 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: I3028f9f97d65f92fd43651995790d3902d0883f7
2023-10-11 00:00:05 +00: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
Xin Li
1ce0477c98 [automerger skipped] Merge Android 14 am: 1fba35369d -s ours am: 5139499d27 -s ours am: 8a40eef5f4 -s ours am: 441255f85a -s ours am: fe8575d1cf -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: I120e19ad9fb19c9c29bcc76fdf2ac96d79e5d9c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-07 00:20:20 +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
Alice Kuo
9ebb7bf1e1 Merge "Add support 48_2 capability for LE audio HW offload" into main 2023-10-04 04:20:57 +00:00
Clint Chen
0a64667594 Merge "F10: Enable build flag versioning for radio and bootloader" into main 2023-10-04 01:33:31 +00:00
Alice Kuo
865f89cab7 Add support 48_2 capability for LE audio HW offload
Bug: 300788009
Test: manual test in UPF
Change-Id: Ib8ed04dddb89885e132e660c0a86da88d93bf0c0
2023-10-04 04:24:30 +08:00
Jimmy Shiu
979e0ab288 Merge "powerhint: Add DISPLAY_CHANGE hint" into main 2023-10-03 14:57:42 +00:00
ClintChen
ec6d75e7c3 F10: Enable build flag versioning for radio and bootloader
Bug: 301142125

Change-Id: I999d9a7c8c8278808ab29415fe903a5127d67941
2023-10-03 09:37:12 +00:00
Shivangi Dubey
3c59d6a09b Merge "Enable Fold Lock Behavior in config.xml" into main 2023-10-02 10:00:09 +00:00
Xin Li
46ab6957fc [automerger skipped] Merge UP1A.231005.007 am: 08f3aa6503 -s ours am: 057645d3b3 -s ours am: c9449d8452 -s ours am: 5dd8a3c959 -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: I2bde6ebe1c69f25ab55886fc933dbe7a4e1f63bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-29 10:20:30 +00: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