Xin Li
86e299ea54
Merge "Merge aosp-24Q3-ts-dev" into aosp-main-future
2024-08-19 22:39:21 +00:00
Mikhail Naganov
3f32ed237a
Merge "audio: Fix stream cleanup sequence" into main am: a6c2d43c79
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3221028
Change-Id: I43ade00b1877f7d0ce16edcfaa3cd02cda7aacbe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-19 16:54:40 +00:00
Mikhail Naganov
a6c2d43c79
Merge "audio: Fix stream cleanup sequence" into main
2024-08-19 16:30:45 +00:00
Xin Li
53b6fae571
Merge aosp-24Q3-ts-dev
...
Bug: 358400644
Merged-In: I48189896138da4efacbe1ce8e46f4267e956771f
Change-Id: Ibb687d6d3e2237bc152e41fcac7ded38be3aabbb
2024-08-16 10:15:18 -07:00
Mikhail Naganov
0413d077f7
audio: Fix stream cleanup sequence
...
Move the cleanup of the stream worker thread from '~StreamCommonImpl'
up to concrete stream implementations. This is because when
the worker thread is stopping, it calls 'DriverInterface::shutdown'
method of the stream. At the time when '~StreamCommonImpl' is
running, the concrete stream class has already been destroyed.
The cleanup actually only happens in the case when the client
did not close the stream properly via 'IStreamCommon.close', or
when the stream creation has failed in the middle.
Bug: 355804294
Test: atest VtsHalAudioCoreTargetTest
Change-Id: Ie86f682af202976ed48d24338b2dffcfd20d9a76
2024-08-15 14:18:51 -07:00
Ted Bauer
9003e94bda
Add new aconfig dependencies am: 922c032573
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3218562
Change-Id: Ia2ac63d4290e0d0e1e5924fa085f23cba99f8e2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-15 17:43:31 +00:00
Ted Bauer
922c032573
Add new aconfig dependencies
...
Aconfig flagging is undergoing an internal storage migration. Add the
new dependencies required for it.
Bug: 347701310
Test: m
Flag: build.RELEASE_READ_FROM_NEW_STORAGE
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:a99ec3073fb95840d965d3acbaee5c9aeabeba49 )
Merged-In: I412df2b36f49215a8b2ffe156641720c14218ba0
Change-Id: I412df2b36f49215a8b2ffe156641720c14218ba0
2024-08-15 13:39:17 +00:00
Treehugger Robot
61ef7ac739
Merge "Convert hardware/interfaces/compatibility_matrices/Android.mk to soong" into main am: 6c7d5ded29
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3195743
Change-Id: I85c16131c55cb9b2921bf025f7e8e6a7dd9f39d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-15 09:35:44 +00:00
Treehugger Robot
6c7d5ded29
Merge "Convert hardware/interfaces/compatibility_matrices/Android.mk to soong" into main
2024-08-15 09:07:38 +00:00
yangbill
a1d5770c37
Convert hardware/interfaces/compatibility_matrices/Android.mk to soong
...
Add a new attribute type which value could only be device_fcm and
product_fcm if set to the vintf_compatibility_matrix module type which
could be used to generate framework_compatibility_matrix.device.xml and
product_compatibility_matrix.xml in soong to convert the original Android.mk
Bug: 352234038
Bug: 344445679
Test: lunch aosp_cheetah-trunk_staging-userdebug
m framework_compatibility_matrix.device.xml \
product_compatibility_matrix.xml
Test: lunch aosp_trout_x86_64-trunk_staging-userdebug
m framework_compatibility_matrix.device.xml \
product_compatibility_matrix.xml
Test: lunch aosp_cf_x86_64_phone-trunk_staging-userdebug
m framework_compatibility_matrix.device.xml \
product_compatibility_matrix.xml
diff $ANDROID_PRODUCT_OUT/system/etc/vintf/compatibility_matrix.device.xml \
device/google/cuttlefish/system_image/compatibility_matrix.device.xml
Change-Id: I1690cf29462c91f5ab80f7a78f6df9cdb6abbf2f
2024-08-15 03:30:53 +00:00
Xin Li
1b8cf8c845
Mark 24Q3 (ab/AP3A.240905.015) as merged
...
Bug: 347831320
Merged-In: I22393acc260d200d2e472d276c64af005a75ab6b
Change-Id: I02b9538e760df889e18fb507c100e0b84973b0e8
2024-08-13 15:41:16 -07:00
Treehugger Robot
2fb82209e0
Merge "audio: Remove unnecessary std::move" into main am: 6883d48156
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3217976
Change-Id: Id3a73ba5fa3f4483b13036eb80af9afdcc6df714
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-13 21:04:34 +00:00
Treehugger Robot
6883d48156
Merge "audio: Remove unnecessary std::move" into main
2024-08-13 20:48:53 +00:00
Treehugger Robot
bd4f0e7ad3
Merge "automotive: Remove unnecessary std::move" into main am: c9777e83a1
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3217719
Change-Id: I609dd3e678ffd7bd84922b3feccbfa3ea38ef8a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-13 20:33:11 +00:00
Treehugger Robot
c9777e83a1
Merge "automotive: Remove unnecessary std::move" into main
2024-08-13 20:07:37 +00:00
Yi Kong
859efb0a90
security: Remove unnecessary std::move am: 99df7ced5d
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3217977
Change-Id: I8cdfdc8174083145f314630c57b3d11a45a59ea7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-13 19:22:09 +00:00
Yi Kong
99df7ced5d
security: Remove unnecessary std::move
...
Moving a temporary object prevents copy elision, and could reduce
performance.
This fixes -Wpessimizing-move compiler warning.
Test: presubmit
Bug: 154270751
Change-Id: I378f1b9029f1a0711728ff14e4071263ad330504
2024-08-14 01:56:18 +08:00
Yi Kong
e62f97fb5b
audio: Remove unnecessary std::move
...
Moving a temporary object prevents copy elision, and could reduce
performance.
This fixes -Wpessimizing-move compiler warning.
Test: presubmit
Bug: 154270751
Change-Id: Idb1a4abf4da9eb6dbe1e9a8fd66461d60985c8e1
2024-08-14 01:52:25 +08:00
Yi Kong
301f5e0d61
automotive: Remove unnecessary std::move
...
Moving a temporary object prevents copy elision, and could reduce
performance.
This fixes -Wpessimizing-move compiler warning.
Test: presubmit
Bug: 154270751
Change-Id: Ia2ffdb8addde27a67d2e2382bef1d45d5261f3ca
2024-08-14 01:50:44 +08:00
Wei Li
0c487a312b
Merge "Remove unused LOCAL_ variables and related logic in hardware/interfaces/compatibility_matrices/compatibility_matrix.mk." into main am: fc8d55a0bf
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3212254
Change-Id: I63c575b32d45b9838915103b5d03b59319108d90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-09 20:43:24 +00:00
Leon Scroggins
2647200f4c
Merge "Assert the errors size to 1 for case SetDisplayBrightness" into main am: 9e65f0a00d
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3174319
Change-Id: Id3d13c4a18c46e5170cfc9336ae40ec64cc6998b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-09 20:42:53 +00:00
Wei Li
fc8d55a0bf
Merge "Remove unused LOCAL_ variables and related logic in hardware/interfaces/compatibility_matrices/compatibility_matrix.mk." into main
2024-08-09 20:30:59 +00:00
Leon Scroggins
9e65f0a00d
Merge "Assert the errors size to 1 for case SetDisplayBrightness" into main
2024-08-09 20:26:37 +00:00
Wei Li
fd11739a60
Remove unused LOCAL_ variables and related logic in hardware/interfaces/compatibility_matrices/compatibility_matrix.mk.
...
After most compatibility_matrices Make modules have been moved to Android.bp there are some unused variables and logic, so remove them to reduce the complexity which helps conversion to Android.bp and reviewing.
Bug: 352234038
Test: CIs
Change-Id: Ic2f4538b3e50cc1ca573634cd46eb64c4013420a
2024-08-08 20:38:59 -07:00
Roshan Pius
2b4d90723f
nfc: Change EXPECT_TRUE to ASSERT_TRUE am: 0f39c73d6e
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3214235
Change-Id: Ic2d100bac2ab73a458a83aff27c676a1e6903b47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-08 20:28:02 +00:00
grekit1024
5766db3007
nfc: Change EXPECT_TRUE to ASSERT_TRUE am: 779985a21d
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3213615
Change-Id: I913244de0cbd217ad410f97b16efe3496a2d8eb5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-08 19:02:25 +00:00
Roshan Pius
0f39c73d6e
nfc: Change EXPECT_TRUE to ASSERT_TRUE
...
Fix other tests missed in aosp/3213615
Bug: 357008220
Change-Id: I0325f2c4efa327f2de389a5363244393ee7d0bea
Test: TH
2024-08-08 18:53:28 +00:00
Myles Watson
965ff77e74
VtsBluetooth: Update advertising set requirements
...
The requirements for advertising sets are the same in the
published VSR requirements for TV and other Android devices,
so there should be no difference in the test.
Bug: 353619486
Test: mma -j32
(cherry picked from https://android-review.googlesource.com/q/commit:864c9048977fdd27f8aab8ec478833768d7514a3 )
Merged-In: I48189896138da4efacbe1ce8e46f4267e956771f
Change-Id: I48189896138da4efacbe1ce8e46f4267e956771f
Bug: 350030122
2024-08-08 17:06:24 +00:00
grekit1024
779985a21d
nfc: Change EXPECT_TRUE to ASSERT_TRUE
...
because if the timeout occurs, a null pointer exception will be caused, and ASSERT_TRUE can interrupt the continued execution of the case.
Test: done
Bug:357008220
Change-Id: I17332c065e35c69630fc24ca2d929c6bff767c08
Signed-off-by: grekit1024 <grekit1024@gmail.com >
2024-08-08 17:05:54 +08:00
Yuyang Huang
559f8149a7
Add support for HFP_HARDWARE_OFFLOAD_DATAPATH session type am: f1527f5a88
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3211376
Change-Id: Icf33b66e435c2a2e904b5b537fafa7de30141922
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-08 03:45:24 +00:00
Yuyang Huang
2f7f279e52
improve condition check for LE audio session am: 9daf187ec6
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3212555
Change-Id: I2bbc7c128001f4c7d31200c7bc349d586bae7278
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-07 23:02:59 +00:00
Yuyang Huang
f1527f5a88
Add support for HFP_HARDWARE_OFFLOAD_DATAPATH session type
...
Bug: 345303008
Change-Id: I0de7fcfaa64ae94e3a78d03685e661c51416ae64
Test: m packages/modules/Bluetooth
Flag: com::android::bluetooth::flags::is_sco_managed_by_audio and HFP session type only enabled when flag is enabled
2024-08-07 21:29:18 +00:00
Yuyang Huang
9daf187ec6
improve condition check for LE audio session
...
Bug: 345303008
Change-Id: Ic360f5463dc9515047dc3cdf3e69564809ea06d3
Test: m packages/modules/Bluetooth
Flag: exempt, no logical change
2024-08-07 21:16:53 +00:00
Treehugger Robot
0eddf3322c
[automerger skipped] Merge "update vts setSimSlotMapping test cases to handle different MEP types Bug: 342543877 Test: atest PerInstance/RadioConfigTest#setSimSlotsMapping/0_android_hardware_radio_config_IRadioConfig_default" into android14-tests-dev am: 3d9d5d8530 -s ours am: 4720db9fd2 -s ours
...
am skip reason: Merged-In I34229669713afabbb7802dfa7c79ff9689a7bdf5 with SHA-1 7529611056 is already in history
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3206357
Change-Id: I9bf996dd554812db5a0dadc1500911f5d8b3dd20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-07 08:50:57 +00:00
sandeepjs
c3c59a1a2f
[automerger skipped] update vts setSimSlotMapping test cases to handle different MEP am: 5ac83a65d0 -s ours am: 6bfe9867e9 -s ours
...
am skip reason: Merged-In I34229669713afabbb7802dfa7c79ff9689a7bdf5 with SHA-1 7529611056 is already in history
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3206357
Change-Id: I0037890f7f15061af57f180787e358e068d774f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-07 08:50:53 +00:00
Treehugger Robot
46fb601cfb
[automerger skipped] Merge "update vts setSimSlotMapping test cases to handle different MEP types Bug: 342543877 Test: atest PerInstance/RadioConfigTest#setSimSlotsMapping/0_android_hardware_radio_config_IRadioConfig_default" into android14-tests-dev am: 3d9d5d8530 -s ours
...
am skip reason: Merged-In I34229669713afabbb7802dfa7c79ff9689a7bdf5 with SHA-1 bb729471a9 is already in history
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3206357
Change-Id: Ie37a24a3566ac3185a01d5138c1c2a9548b314d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-07 08:36:51 +00:00
sandeepjs
0d80c08f12
[automerger skipped] update vts setSimSlotMapping test cases to handle different MEP am: 5ac83a65d0 -s ours
...
am skip reason: Merged-In I34229669713afabbb7802dfa7c79ff9689a7bdf5 with SHA-1 bb729471a9 is already in history
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3206357
Change-Id: I8dbe50efee2b8b80cf73b1e97605a8cae7f921ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-07 08:36:44 +00:00
Treehugger Robot
4720db9fd2
[automerger skipped] Merge "update vts setSimSlotMapping test cases to handle different MEP types Bug: 342543877 Test: atest PerInstance/RadioConfigTest#setSimSlotsMapping/0_android_hardware_radio_config_IRadioConfig_default" into android14-tests-dev am: 3d9d5d8530 -s ours
...
am skip reason: Merged-In I34229669713afabbb7802dfa7c79ff9689a7bdf5 with SHA-1 7529611056 is already in history
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3206357
Change-Id: I69dbace846761421219e81751bbdfe82e84a6ace
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-07 08:30:38 +00:00
sandeepjs
6bfe9867e9
[automerger skipped] update vts setSimSlotMapping test cases to handle different MEP am: 5ac83a65d0 -s ours
...
am skip reason: Merged-In I34229669713afabbb7802dfa7c79ff9689a7bdf5 with SHA-1 7529611056 is already in history
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3206357
Change-Id: I3792e62e8d93b2895d7fbfeeadcfe4041d7e88ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-07 08:30:34 +00:00
Treehugger Robot
3d9d5d8530
Merge "update vts setSimSlotMapping test cases to handle different MEP types Bug: 342543877 Test: atest PerInstance/RadioConfigTest#setSimSlotsMapping/0_android_hardware_radio_config_IRadioConfig_default" into android14-tests-dev
2024-08-07 08:21:21 +00:00
Chan Wang
6fdcc42381
Merge "Mark 'android.hardware.common.fmq' as available in any apex" into main am: d6e11e29bb
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3204653
Change-Id: If2536d73cbc7f13d71f0280662b829c22f6cf7d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-07 05:10:31 +00:00
Chan Wang
d6e11e29bb
Merge "Mark 'android.hardware.common.fmq' as available in any apex" into main
2024-08-07 04:55:42 +00:00
Treehugger Robot
dfbe1009ca
Merge "Update the UdsCertChain comment to reflect the latest recommendation." into main am: 9471625f69
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3207215
Change-Id: I35335952f59f2c90204c0b38628d94df27913e70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-07 00:22:09 +00:00
Bart Van Assche
faee05bad9
Merge "libhealthloop: Only wake up for power supply events" into main am: 2ab04e760b
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3199931
Change-Id: I2d2f61ac824c7a23b97c1cf9e3d12e4a552b0f00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-07 00:21:49 +00:00
Treehugger Robot
9471625f69
Merge "Update the UdsCertChain comment to reflect the latest recommendation." into main
2024-08-07 00:07:52 +00:00
Bart Van Assche
2ab04e760b
Merge "libhealthloop: Only wake up for power supply events" into main
2024-08-06 23:51:23 +00:00
Tommy Chiu
2027a9b597
Update the UdsCertChain comment to reflect the latest recommendation.
...
Bug: 331136391
Test: comment update only
Change-Id: I72f45c85d106d87fcd4c56d4c4fa86eb1af8f5a7
2024-08-07 07:10:57 +08:00
Treehugger Robot
bbb3ed8e14
Merge "update vts setSimCardPower test cases to handle different MEP types Bug: 351698476 Test: atest VtsHalRadioTargetTest" into android14-tests-dev am: 1a07256b4b am: 55d9f9c5a2
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3207432
Change-Id: Idddb55dbf529c824bd496f625dd2dcc27e12d72e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-06 21:59:22 +00:00
Ping Fan
29d0ae3d02
Fix validation logic in TvInputAidlTest am: 73b1d1aa5c am: 401bc9f9c0
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3207431
Change-Id: I6670d00ca0b90bb7c579949e8213cd8d896645d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-06 21:58:20 +00:00
Treehugger Robot
07f02fdd22
[automerger skipped] Merge "update vts setSimCardPower test cases to handle different MEP types Bug: 351698476 Test: atest VtsHalRadioTargetTest" into android14-tests-dev am: 1a07256b4b -s ours
...
am skip reason: Merged-In I233a12514afb39de32ba72e350d0a5dc94c98daf with SHA-1 f519f2e321 is already in history
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3207432
Change-Id: I40d625293b303dc12dbe97c4b0db0fd6a4103941
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-06 21:48:54 +00:00