Xin Li
dba62a135a
Merge 2024-06 Release (ab/AP2A.240605.024) to aosp-main-future
...
Bug: 343100748
Merged-In: I0b4bea1a97004139cc18129eeeab302aa557ca05
Change-Id: Iba46bfc0ab8cfaf0e6cc451327633efaf19567a6
2024-06-05 14:12:12 -07:00
Cyan_Hsieh
3353815bc3
Switch makefile owners to MK_OWNERS am: 5537f0189d
...
Original change: https://android-review.googlesource.com/c/device/google/felix/+/3107247
Change-Id: Idf6420dfddc69f692d5b94a9878a1ce9897c5fb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 14:29:13 +00:00
Cyan_Hsieh
5537f0189d
Switch makefile owners to MK_OWNERS
...
Bug: 278167548
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:5f2a464f9f1dd6536b257d873ad4c47bd0ae83f9 )
Merged-In: Idb90ff62c5180bc81e358bad05df03d1c0ba2023
Change-Id: Idb90ff62c5180bc81e358bad05df03d1c0ba2023
2024-05-29 10:00:10 +00:00
Xin Li
1c48c9f6e4
Merge Android 24Q2 Release (ab/11526283) to aosp-main-future
...
Bug: 337098550
Merged-In: Iac265af75b5fbb9bf6b34448ff3d2d4413ae3959
Change-Id: I59d25be35974c9b6ae5140fbe02a0e457de59845
2024-05-06 12:09:15 -07:00
Android Build Coastguard Worker
732cd88b6d
Merge cherrypicks of ['googleplex-android-review.googlesource.com/27086672'] into 24Q2-release.
...
Change-Id: I089cfc6069aca96bddf7f990b9ef58ec14ff79e6
2024-04-26 01:55:19 +00:00
Ankur Bakshi
3f3a05ab87
Update felix SVN to 51
...
Bug: 336526332
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:e222c307125a3c038eb3c5376453c70d9c47040c )
Merged-In: I0b4bea1a97004139cc18129eeeab302aa557ca05
Change-Id: I0b4bea1a97004139cc18129eeeab302aa557ca05
2024-04-26 01:54:07 +00:00
Android Build Coastguard Worker
0038db3638
Merge cherrypicks of ['googleplex-android-review.googlesource.com/26749527', 'googleplex-android-review.googlesource.com/26822671'] into 24Q2-release.
...
Change-Id: I96bde3102906110b68c9fed63f74e28b9454cc24
2024-04-12 21:39:27 +00:00
Ankur Bakshi
d87c7b7935
Update felix SVN to 50
...
Bug: 330382848
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:73220aeecf69ad2c7a04be657263379aa4406b24 )
Merged-In: Ic4cb9fec016661b45d7af9a1075e5912bd435b9e
Change-Id: Ic4cb9fec016661b45d7af9a1075e5912bd435b9e
2024-04-12 21:13:27 +00:00
Ankur Bakshi
b979856d65
Update felix SVN to 49
...
Bug: 330382848
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:f4e79e0825e6520e1d801f8b238ee87d22003341 )
Merged-In: I4adff31a3d552c862fab43cba73c0cb074904be8
Change-Id: I4adff31a3d552c862fab43cba73c0cb074904be8
2024-04-12 21:13:08 +00:00
Android Build Coastguard Worker
7d7eaf2107
Merge cherrypicks of ['googleplex-android-review.googlesource.com/26642020'] into 24Q2-release.
...
Change-Id: I221080236fa33a7200587cf74f130d2711dc45a5
2024-03-28 22:19:11 +00:00
Ravi Jain
ecc275fbeb
cs40l26: Align Felix Hal with common HAL
...
Pull ag/22589260 to replace new/delete by using vector from the common
HAL.
Bug: 322648133
Test: idlcli compose commands
Test: adb shell cmd vibrator_manager synced prebaked 1
Test: adb shell idlcli vibrator compose 0 8 1.0; \
sleep 1; adb shell idlcli vibrator compose 0 7 1.0;
Test: atest PtsVibratorHalTestSuite \
PtsHapticsTestCases \
VibratorHalCs40l26TestSuitePrivate \
VtsHalVibratorManagerTargetTest \
VtsHalVibratorTargetTest \
android.os.cts.VibratorTest \
android.os.cts.VibratorManagerTest \
android.os.cts.VibrationEffectTest \
android.os.cts.VibrationAttributesTest \
android.os.cts.CombinedVibrationTest
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:75d87040c7284b0d0ef2f20e5edd2e2d384d943c )
Merged-In: Ia6e9111c47f27089521f05a68b538bbefb235d6b
Change-Id: Ia6e9111c47f27089521f05a68b538bbefb235d6b
2024-03-28 22:11:29 +00:00
Android Build Coastguard Worker
75f499dd22
Merge cherrypicks of ['googleplex-android-review.googlesource.com/26245621', 'googleplex-android-review.googlesource.com/26247218', 'googleplex-android-review.googlesource.com/26247756', 'googleplex-android-review.googlesource.com/26463011', 'googleplex-android-review.googlesource.com/26666719'] into 24Q2-release.
...
Change-Id: If33004cbe8ac0811f6809339785a04c3dbec612b
2024-03-26 23:37:44 +00:00
Ankur Bakshi
cf3571dadb
Update felix SVN to 48
...
Bug: 325156176
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:662666134fbc1977fb83a555ffaa5c7c816d62e0 )
Merged-In: Ifd4c3df67510d9f7cf5a88b9269614572b5eb0bc
Change-Id: Ifd4c3df67510d9f7cf5a88b9269614572b5eb0bc
2024-03-26 23:25:50 +00:00
Ankur Bakshi
0eb1a04ba5
Update felix SVN to 47
...
Bug: 325156176
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:0771df9996399b0dedc54365019ee465293cf386 )
Merged-In: I80ca14c7073707ef69dd3feef8f7731afbe09582
Change-Id: I80ca14c7073707ef69dd3feef8f7731afbe09582
2024-03-26 23:25:35 +00:00
Ankur Bakshi
ad8c399053
Update felix SVN to 46
...
Bug: 325156176
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:bc701d8d613ee962e0a2702a527dd5955e8e38eb )
Merged-In: I84212cd2b6e36d162d6f6624a21f393e0ec0d070
Change-Id: I84212cd2b6e36d162d6f6624a21f393e0ec0d070
2024-03-26 23:25:18 +00:00
Ankur Bakshi
9438545847
Update felix SVN to 45
...
Bug: 325156176
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:abb540718bb58da443eb970b65e63de85704eef1 )
Merged-In: I5ebc65fcd00c7d5c593f8a56c8ccdfd424551005
Change-Id: I5ebc65fcd00c7d5c593f8a56c8ccdfd424551005
2024-03-26 23:25:03 +00:00
Ankur Bakshi
74ea4be154
Update felix SVN to 44
...
Bug: 325156176
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:e30274d4c9f0f7138a665f3092c99fb767607c95 )
Merged-In: Id9052a3303fc7c2c1842f3db9b52a2adf1ba164e
Change-Id: Id9052a3303fc7c2c1842f3db9b52a2adf1ba164e
2024-03-26 23:24:47 +00:00
Android Build Coastguard Worker
85e4d63ea1
Merge cherrypicks of ['googleplex-android-review.googlesource.com/26019795'] into 24Q2-release.
...
Change-Id: I40a2a35c6be211b8fa60e6dce38f3654a847674f
2024-03-20 21:30:09 +00:00
Cheng Chang
620aafc025
gps: Disable Vzw SUPL OTDOA
...
Bug: 322404137
Test: OTDOA test in b/322404137
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:06b419a5788399df5e4cf5721e8e487a6c052121 )
Merged-In: Id0fb2286c594f335349b3219953043f7f7830a03
Change-Id: Id0fb2286c594f335349b3219953043f7f7830a03
2024-03-20 21:23:00 +00:00
Android Build Coastguard Worker
19017edfaf
Merge cherrypicks of ['googleplex-android-review.googlesource.com/26348042'] into 24Q2-release.
...
Change-Id: I404e905a8d8a67499f5b12fe04e86ddbf1c51be3
2024-03-08 23:58:20 +00:00
Ravi Jain
0e465792b0
cs40l26: Align Felix Hal with common HAL
...
Pull DSPMemChunk related CLs from common HAL.
ag/22087481, ag/22093662
Bug: 322648133
Test: idlcli compose commands
Test: adb shell cmd vibrator_manager synced prebaked 1
Test: adb shell idlcli vibrator composePwle -b \
a 0.1 300.0 0.1 30.0 1000 \
a 0.1 30.0 0.1 300.0 500
Test: atest PtsVibratorHalTestSuite \
PtsHapticsTestCases \
VibratorHalCs40l26TestSuite \
VtsHalVibratorManagerTargetTest \
VtsHalVibratorTargetTest \
android.os.cts.VibratorTest \
android.os.cts.VibratorManagerTest \
android.os.cts.VibrationEffectTest \
android.os.cts.VibrationAttributesTest \
android.os.cts.CombinedVibrationTest
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:85299be2adc9e3dec373dc48f321c4fa1930e260 )
Merged-In: I32258500ec02c2a8cbfc6d0b37aaea2c83c7c8b4
Change-Id: I32258500ec02c2a8cbfc6d0b37aaea2c83c7c8b4
2024-03-08 23:54:07 +00:00
Xin Li
edf45affd6
[automerger skipped] Merge Android 14 QPR2 to AOSP main am: 57e651cd73
-s ours
...
am skip reason: Merged-In I1e89d5091baa1df8662e4dcbd0a15460d0826c4b with SHA-1 099b593e11
is already in history
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2990601
Change-Id: I258ff0f0d84a18a0b5490f9676d6da4e41be94dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-07 09:55:00 +00:00
Xin Li
57e651cd73
Merge Android 14 QPR2 to AOSP main
...
Bug: 319669529
Merged-In: I1e89d5091baa1df8662e4dcbd0a15460d0826c4b
Change-Id: I5ec91ce4c108cefcb2510fa54e28e888f5bff567
2024-03-06 09:29:47 -08:00
Android Build Coastguard Worker
f34dcae450
Snap for 11520864 from 2f802dde2c
to 24Q2-release
...
Change-Id: I7e3a3a3a69aa372b3b9bb23cf893d1530efefb75
2024-03-02 02:02:12 +00:00
Treehugger Robot
2f802dde2c
Merge "Enabling Observe mode" into main
2024-03-01 00:29:10 +00:00
Android Build Coastguard Worker
1f475be484
Snap for 11517367 from 64a306d0e1
to 24Q2-release
...
Change-Id: Ia7b6410ea799b287247a0c94f13b83f94563023d
2024-03-01 00:02:29 +00:00
Brad Lassey
5c4d4da8e8
Enabling Observe mode
...
Bug: 327601464
Test: Tested on local device
Change-Id: Iac265af75b5fbb9bf6b34448ff3d2d4413ae3959
2024-02-29 20:07:24 +00:00
Treehugger Robot
64a306d0e1
Merge "Initial Bootloader prebuilt for AP3% build" into main
2024-02-29 17:52:00 +00:00
Treehugger Robot
152bb2fbc5
Merge "Revert "Extend LE Audio allow list candidate device"" into main
2024-02-29 11:00:47 +00:00
Alice Kuo
6438a6b0b5
Revert "Extend LE Audio allow list candidate device"
...
This reverts commit 6d85c6b997
.
Reason for revert: no in plan for 24Q2
Bug: 327554841
Test: build
Change-Id: I090aba7e994ffb31738a2e330b9c387c7bb52421
2024-02-29 09:19:38 +00:00
Cyan_Hsieh
d9fc654578
Initial Bootloader prebuilt for AP3% build
...
Bug: 326002225
Change-Id: I2ee8eef6d76ad14f544a04bfba060f6b77ad4303
2024-02-27 16:48:05 +08:00
Android Build Coastguard Worker
c8262afaff
Snap for 11469542 from d2bc8e7dc0
to 24Q2-release
...
Change-Id: I696d2eb6c813ef6d999861705d2da036e5b6d7dd
2024-02-20 00:02:14 +00:00
George Chang
d2bc8e7dc0
Enable NFC firmware logging
...
Enable NFC firmware logging by default for better debuggability.
Bug: 307999188
Bug: 325604333
Test: manual
Change-Id: I1a6265b5e041cc06e4c23e328059663ea6f81c63
2024-02-19 06:54:47 +00:00
Android Build Coastguard Worker
1675832621
Merge "Snap for 11456215 from 0764dad6b4
to 24Q2-release" into 24Q2-release
2024-02-16 01:40:21 +00:00
Android Build Coastguard Worker
8cd0d9ec69
Snap for 11456215 from 0764dad6b4
to 24Q2-release
...
Change-Id: Ic744ea785cd9c6b4d755623728a02508b142161e
2024-02-16 00:33:03 +00:00
Android Build Coastguard Worker
8043d812c7
Snap for 11456215 from 0764dad6b4
to 24Q2-release
...
Change-Id: I1f9dffa269af0cbba3647111fe53bca5cf83578b
2024-02-16 00:21:04 +00:00
Ankur Bakshi
0764dad6b4
Merge "Update felix SVN to 43" into main
2024-02-14 19:18:22 +00:00
Ankur Bakshi
84d454c0ec
Update felix SVN to 43
...
Bug: 313797924
Change-Id: Ibbf7ca80f79eb5d46c3213b18ce1a056cf932825
2024-02-14 00:13:17 +00:00
Android Build Coastguard Worker
1678c561e9
Snap for 11420186 from 1502466c69
to 24Q2-release
...
Change-Id: I2a5de5b1edc367b566b1397c5a7b63fbd71e1df1
2024-02-08 00:02:39 +00:00
Jacky Liu
1502466c69
Merge "Update i2c device paths" into main
2024-02-07 08:20:38 +00:00
Alice Kuo
6d85c6b997
Extend LE Audio allow list candidate device
...
Bug: 323247113
Test: tester manual test result via b/322564783
Change-Id: Ibdc9d7f3bde60fc59af3a47e8c646a780a6f11a1
2024-02-07 07:30:15 +00:00
Android Build Coastguard Worker
553d406237
Snap for 11413328 from dbd48e97c0
to 24Q2-release
...
Change-Id: Ib943f1379a71fc736036ed2f5674d39304a4b7c7
2024-02-07 00:02:37 +00:00
Jacky Liu
331b140bab
Update i2c device paths
...
Update i2c device paths with static bus numbers.
Bug: 323447554
Test: Boot to home
Change-Id: Id98eda794ef6c14e832dc3b40350f76adcb60ad8
2024-02-06 16:17:39 +00:00
Kimi Hsu
dbd48e97c0
Add face sensor configs
...
Bug: 323116566
Test: make
Flag: NONE
Change-Id: I8a883602b791fcdf38df9310f14bc88467b0b182
2024-02-05 09:41:56 +00:00
Android Build Coastguard Worker
e88ba7eb1b
Snap for 11386701 from 9d46aabce5
to 24Q2-release
...
Change-Id: I9d5b34fe97102c10ae53559802f0d94ec8265a58
2024-02-01 00:01:56 +00:00
Xin Li
9d46aabce5
[automerger skipped] Merge Android 24Q1 Release (ab/11220357) am: 099b593e11
-s ours
...
am skip reason: Merged-In Id61bda25845fd181ade10f12e3bc3554db4f6978 with SHA-1 302f0a318f
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25973104
Change-Id: Icf8dee4fd5a04957e84f96c15b3a0268da4ce317
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-31 02:03:20 +00:00
Android Build Coastguard Worker
930101e443
Snap for 11380007 from 679a1686b2
to 24Q2-release
...
Change-Id: I5ae76cfbcb38138bf6aaa2b4a93b16b2ef735ac4
2024-01-31 00:02:11 +00:00
Ankur Bakshi
679a1686b2
Update felix SVN to 42
...
Bug: 313797924
Change-Id: I831101a977dc0752fc1a21b52fe8c9f8f396ce23
2024-01-30 18:47:19 +00:00
Android Build Coastguard Worker
50c0756cd3
Snap for 11373247 from a17bd159c4
to 24Q2-release
...
Change-Id: I46a98d8174ecc4711042e67690cc723f3feb17c6
2024-01-30 02:02:35 +00:00
Ankur Bakshi
a17bd159c4
Update felix SVN to 41 am: 8ee4be5ce2
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/26030060
Change-Id: I32344ed25bda7d017f4bee9dbb5c11f0183b94cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-29 19:46:06 +00:00