Commit Graph

53992 Commits

Author SHA1 Message Date
Myles Watson
e080dca0bc Merge "BluetoothAudio: Statically link HAL dependencies" into main am: e023a39508 am: 1e0b2ebe91 am: 86a42ced71
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2654741

Change-Id: If958936c1b87aeb15332f3972c45b6d3b8bf22d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 02:37:58 +00:00
Myles Watson
86a42ced71 Merge "BluetoothAudio: Statically link HAL dependencies" into main am: e023a39508 am: 1e0b2ebe91
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2654741

Change-Id: Ib34fef3c80b50c1a8b8769c2192404d52368b48a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 01:58:05 +00:00
Gabriel Biren
0804b6fd0e Represent NAN callback events as a bitmap am: 3f7bfd2dc5 am: 6b039c37e5
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24029040

Change-Id: I54b3a56584782f5c491cd239b2bdd6d0933d689f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 01:55:23 +00:00
Gabriel Biren
6b039c37e5 Represent NAN callback events as a bitmap am: 3f7bfd2dc5
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24029040

Change-Id: Ifcee3c8f59ede7096cab5ac219e6c64b3ffcadeb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 01:15:56 +00:00
Myles Watson
1e0b2ebe91 Merge "BluetoothAudio: Statically link HAL dependencies" into main am: e023a39508
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2654741

Change-Id: I82fd0fe4dc73712786bad86a0d203efeecc05d2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 01:15:30 +00:00
Myles Watson
e023a39508 Merge "BluetoothAudio: Statically link HAL dependencies" into main 2023-07-12 00:20:53 +00:00
Myles Watson
44628f38d2 BluetoothAudio: Statically link HAL dependencies
Bug: 290666670
Bug: 289857524
Bug: 284091286
Bug: 289489060
Test: mma -j32
Change-Id: I2b3c32b133e208ec2cfb1b244ccb24ad249f22df
2023-07-11 16:08:27 -07:00
Gabriel Biren
3f7bfd2dc5 Represent NAN callback events as a bitmap
to better handle overlapping events.

Reimplementation of aosp/2473685 for
the AIDL VTS tests.

Bug: 290318208
Test: atest VtsHalWifiNanIfaceTargetTest
Change-Id: I1a0e6ab8dd529c10fcec8f26424a7181e7d91568
2023-07-11 22:23:34 +00:00
Zhanglong Xia
0baf227721 Merge "fix the Thread Network fuzz testing error" into main am: 2f5e431e3f am: cd06171063 am: d87197e6cb
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2646669

Change-Id: I94d6ed14d14f947a498140c51d84ca94f59b73a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11 10:18:22 +00:00
Zhanglong Xia
d87197e6cb Merge "fix the Thread Network fuzz testing error" into main am: 2f5e431e3f am: cd06171063
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2646669

Change-Id: Iacf94bc6e370dc1df71d3a0becba72ab6e9661c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11 09:37:20 +00:00
Zhanglong Xia
cd06171063 Merge "fix the Thread Network fuzz testing error" into main am: 2f5e431e3f
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2646669

Change-Id: I515d5475520a77b57dfa02716cb8c723ba50306d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11 08:55:04 +00:00
Zhanglong Xia
2f5e431e3f Merge "fix the Thread Network fuzz testing error" into main 2023-07-11 08:10:50 +00:00
Zhanglong Xia
1ea0586837 Merge "change the Thread Network HAL api from 'reset' to 'hardwareReset'" into main am: 086e138474 am: 715b1abf5b am: 39d9ddb327
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2649860

Change-Id: I32482790baea4aa13c993f1201d98572e58cc222
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11 04:44:20 +00:00
Zhanglong Xia
39d9ddb327 Merge "change the Thread Network HAL api from 'reset' to 'hardwareReset'" into main am: 086e138474 am: 715b1abf5b
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2649860

Change-Id: I55bf2d7dc9cc5bab2bb042672952cc78fa50fff0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11 04:01:46 +00:00
Zhanglong Xia
715b1abf5b Merge "change the Thread Network HAL api from 'reset' to 'hardwareReset'" into main am: 086e138474
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2649860

Change-Id: I578c768106de06e10834dbb37a87a7e2628b7624
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11 03:21:18 +00:00
Zhanglong Xia
086e138474 Merge "change the Thread Network HAL api from 'reset' to 'hardwareReset'" into main 2023-07-11 02:46:43 +00:00
Yifan Hong
3716063e4e Merge "compatibility_matrices: Add script to create the next." into main am: 9d0b975f6c am: 32ff4ec295 am: b574f6e46e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2572973

Change-Id: I0d210d06a832b999e3747342b32f3696c8db534e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 23:05:32 +00:00
Yifan Hong
b574f6e46e Merge "compatibility_matrices: Add script to create the next." into main am: 9d0b975f6c am: 32ff4ec295
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2572973

Change-Id: I058699e1af810cdb7031cb9e2ed01181e2fb7e25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 22:25:59 +00:00
Yifan Hong
32ff4ec295 Merge "compatibility_matrices: Add script to create the next." into main am: 9d0b975f6c
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2572973

Change-Id: I3b745facd24b5ecb6e24bc169bb71499412a5a75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 21:44:33 +00:00
Yifan Hong
9d0b975f6c Merge "compatibility_matrices: Add script to create the next." into main 2023-07-10 21:14:34 +00:00
Yifan Hong
ace13dee65 compatibility_matrices: Add script to create the next.
Add a `bump.py` script that does the following:
- Create a commit in kernel/configs with the new versions
- Copy the latest compatibility matrix to a new compatibility matrix
- Fix Android.bp and Android.mk

Prerequisite:
- libvintf/Level.h must contain the mapping for the next release.

Test: bump.py 9 10
Bug: 279809082

Change-Id: I4520a128b39f66a03f22d24218348f5fff92e9cd
2023-07-10 12:37:27 -07:00
Bao Do
97c60a8941 Add a config with test skipping for SDK < 33 am: 00dede017f am: 96cfab642d am: aa9d996afd
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2651740

Change-Id: Ie5f490336c080ef24252870651b506160585b965
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 11:28:52 +00:00
Bao Do
aa9d996afd Add a config with test skipping for SDK < 33 am: 00dede017f am: 96cfab642d
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2651740

Change-Id: Id747a38ddc42e6c066849b651cec90e0c0b2d68b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 10:45:32 +00:00
Bao Do
96cfab642d Add a config with test skipping for SDK < 33 am: 00dede017f
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2651740

Change-Id: Ibb47a33394c35f0fc99dbe47058c4309b683ac11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 10:04:41 +00:00
Bao Do
00dede017f Add a config with test skipping for SDK < 33
Test: atest VtsHalBluetoothAudioTargetTest
Bug: 288598199
Change-Id: I563c8d50b186f2da2cf077dc3631808f8c2a9eee
2023-07-10 07:43:09 +00:00
Treehugger Robot
589e7010a5 Merge "health: Check return value of LinkedCallback::Make." into main am: af52e698da am: 30525c3b18 am: 390416afba
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2651239

Change-Id: I99052471e14938816eece12629492cc677edf450
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 22:29:05 +00:00
Treehugger Robot
d8ab63802a Merge "Fix flaky recurrent timer test." into main am: d0cb2e73b2 am: 83e99ff3b1 am: b3f840a6ff
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2651319

Change-Id: Ia670893b8cebee92cb8d6f2248123009c434382c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 22:28:53 +00:00
Treehugger Robot
390416afba Merge "health: Check return value of LinkedCallback::Make." into main am: af52e698da am: 30525c3b18
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2651239

Change-Id: I92fc1e8558c1ff92b5274b5bc30c2cb2a52456aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 21:48:52 +00:00
Treehugger Robot
b3f840a6ff Merge "Fix flaky recurrent timer test." into main am: d0cb2e73b2 am: 83e99ff3b1
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2651319

Change-Id: I0b8d34ce57480d61294aac01c2c382e324c9321b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 21:48:42 +00:00
Treehugger Robot
30525c3b18 Merge "health: Check return value of LinkedCallback::Make." into main am: af52e698da
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2651239

Change-Id: I589a60b097b37e6742118106bae3e0e3b33d3261
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 21:08:00 +00:00
Treehugger Robot
83e99ff3b1 Merge "Fix flaky recurrent timer test." into main am: d0cb2e73b2
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2651319

Change-Id: Ibc86978c67c30d4bb9bfb8e13f6651632a643e46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 21:07:47 +00:00
Treehugger Robot
af52e698da Merge "health: Check return value of LinkedCallback::Make." into main 2023-07-07 20:54:25 +00:00
Treehugger Robot
84816ec99d Merge "Clarify null-termination of name field" into main am: 8328cbb343 am: b47a11c1d5 am: 3f76bf5b23
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2651037

Change-Id: I8840b5f4925bd801ddf4b39940b6b6246631176b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 20:43:39 +00:00
Treehugger Robot
d0cb2e73b2 Merge "Fix flaky recurrent timer test." into main 2023-07-07 20:32:25 +00:00
Yu Shan
bdba2b578d Fix flaky recurrent timer test.
Do not rely on sleep in tests, but wait for the events to happen
before timeout. Set the timeout to be large enough (5s) so that the
tests are more stable.

Test: atest RecurrentTimerTest
Bug: 289759453
Change-Id: Iff271ca440426871ed3a798bab50b9532f9256f0
Merged-In: Iff271ca440426871ed3a798bab50b9532f9256f0
(cherry picked from commit 76d7fbf6a1)
2023-07-07 20:30:43 +00:00
Treehugger Robot
3f76bf5b23 Merge "Clarify null-termination of name field" into main am: 8328cbb343 am: b47a11c1d5
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2651037

Change-Id: Ib526ad1afd6d85d3ed1fe9a8075685d4ba07080b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 20:03:44 +00:00
Treehugger Robot
b47a11c1d5 Merge "Clarify null-termination of name field" into main am: 8328cbb343
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2651037

Change-Id: I0be35741621afcefa20221a757c74d5cb53501e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 19:21:58 +00:00
Treehugger Robot
8328cbb343 Merge "Clarify null-termination of name field" into main 2023-07-07 18:35:22 +00:00
Mikhail Naganov
4491c5c06e Merge "audio: Fix default surround sound config" into main am: 1b5dab3553 am: 3a4100ec40 am: 4eae019584
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2650299

Change-Id: Ifdf792ff09a4cdc6c4c3e27da385c4f692c5420f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 17:36:14 +00:00
Mikhail Naganov
4eae019584 Merge "audio: Fix default surround sound config" into main am: 1b5dab3553 am: 3a4100ec40
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2650299

Change-Id: If94688451246d7a3ee4f13206531d1e1bca6490c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 16:54:57 +00:00
Mikhail Naganov
3a4100ec40 Merge "audio: Fix default surround sound config" into main am: 1b5dab3553
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2650299

Change-Id: I7ad3c54925c38c6aa0d732719c8b20e568acae0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 16:11:14 +00:00
John Reck
735206b1a5 Clarify null-termination of name field
Test: make
Change-Id: I22e7c20074fe49bd533fc16c88a979447362d3f2
2023-07-07 12:11:00 -04:00
Mikhail Naganov
1b5dab3553 Merge "audio: Fix default surround sound config" into main 2023-07-07 15:42:07 +00:00
Zhanglong Xia
a6165dcccf change the Thread Network HAL api from 'reset' to 'hardwareReset'
This CL changes the API from 'reset' to 'hardwareReset' to make the
the definition of the API clearer. This CL also optimizes the Thread
Network HAL default implementation.

Bug: 289867661
Test: Run Thread stack on cuttlefish.
Change-Id: Id742453d9d7a0d369ac8f16905efdacfcfba1dbc
2023-07-07 11:22:57 +08:00
Treehugger Robot
6fd87a9b7e Merge "Allow face HAL to be updated via apex in U" into main am: 099240ae66 am: 7e69098f40 am: 80cba87acb
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2649859

Change-Id: I44b2ecc3703c984b982735e5df1582e6a9fcd14a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 01:22:55 +00:00
Yifan Hong
70197263f0 health: Check return value of LinkedCallback::Make.
If LinkedCallback::Make returns nullptr, do not put it
in Health::callback_. Otherwise, OnHealthInfoChanged
crashes later because the linked callback objects are
not null checked before accessing.

Test: android.hardware.health-service.aidl_fuzzer (with
  a special corpus)
Fixes: 289599278
Change-Id: I8bad41dbcfbefeb54744059baffd4eef1ae7ec42
2023-07-06 17:46:25 -07:00
Treehugger Robot
80cba87acb Merge "Allow face HAL to be updated via apex in U" into main am: 099240ae66 am: 7e69098f40
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2649859

Change-Id: I1f8cfdd1553fcaf0f6b5d67a3cbbdc4a36d7f3d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 00:39:21 +00:00
Treehugger Robot
7e69098f40 Merge "Allow face HAL to be updated via apex in U" into main am: 099240ae66
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2649859

Change-Id: Ie8ce1d390a0bb03a02e0ac0c9426022251123aff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06 23:57:21 +00:00
Treehugger Robot
099240ae66 Merge "Allow face HAL to be updated via apex in U" into main 2023-07-06 22:06:52 +00:00
Mikhail Naganov
724b24f895 audio: Fix default surround sound config
Ensure that all formats returned by
AudioPolicyConfigXmlConverter::getDefaultSurroundSoundConfig
can be converted into legacy values.

Bug: 290116634
Test: atest audio_policy_config_xml_converter_tests
Change-Id: I3a46ea5ee4805f719c8977064c9d8d681a75cff2
2023-07-06 13:51:37 -07:00