Commit Graph

67006 Commits

Author SHA1 Message Date
Patryk Duda
2d00cd0b68 Enable Rust backend on Keymint, Fingerprint and Biometrics interfaces
This is necessary to implement fingerprint HAL in Rust.

Bug: 366409699
Test: Build pass
Merged-In: I6d925fadb94252cd9d66f93b3085c231ff52fe86
Change-Id: I6d925fadb94252cd9d66f93b3085c231ff52fe86
2024-09-16 11:33:43 +00:00
Treehugger Robot
36470a4400 Merge "bump.py: modify the phony system_compatibility_matrix.xml module" into main 2024-09-13 00:05:43 +00:00
Treehugger Robot
06b9e8ae94 Merge "Allow subclass to override getS2rS2dConfig." into main 2024-09-12 23:05:04 +00:00
Yu Shan
fad11013dc Allow subclass to override getS2rS2dConfig.
For host-side fake VHAL, it does not have access to android system
property so it needs to override the config.

Flag: EXEMPT HAL change
Test: Presubmit
Bug: 365994148
Change-Id: Ica0483bd5c9dc4dc2a5301acf5115745a4aa46fb
2024-09-12 14:32:14 -07:00
Devin Moore
f28b695456 bump.py: modify the phony system_compatibility_matrix.xml module
Some of the vintf build steps in Android.mk have been moved into soong
with the system_compatibility_matrix.xml phony module, so we need to
bump those now too.

Test: build/make/tools/finalization/build-step-0-and-m.sh
cf_x86_64_phone && m
Bug: 331696132

Change-Id: I8d017b12aa2d2ecc097ae58c39007ce6585429e1
2024-09-12 20:54:48 +00:00
Treehugger Robot
fd6b994b9d Merge "Remove trong@ from OWNERS" into main 2024-09-12 17:22:47 +00:00
Max Bires
6347dd5742 Remove trong@ from OWNERS
Cleaning up the OWNERS file for those who are no longer on the team.

Test: The ghost of trong@'s account cannot approve changes in this
repository
Change-Id: Ib777c16b53691f82de5bea33bd3cc363a8720982

Change-Id: I6c2bcdbfc6177b5d8e9416a5b93edf7e5e8a2b5b
2024-09-12 15:23:31 +00:00
Roshan Pius
ebf4298956 secure_element: Don't enable omapi feature on cuttlefish
This feature flag also needs some work in implementing the corresponding
access control rules. Otherwise, the CTS tests will fail. Re-enable this once that is fully implemented.

Bug: 289193458
Change-Id: I426bce4db0715c5136c15ddf68afdcf2966cb7af
Test: atest OmapiTest
2024-09-12 00:28:37 +00:00
Karuna Wadhera
e2346b7a13 Merge "Revert "Revert "Optionally (dis)allow degenerate DICE chains in ..."" into main 2024-09-11 13:06:14 +00:00
Treehugger Robot
52ed6c3497 Merge "Correct the UDS_pub source" into main 2024-09-11 00:30:54 +00:00
Karuna Wadhera
6a0dd7014d Revert "Revert "Optionally (dis)allow degenerate DICE chains in ..."
Revert submission 3260534-revert-3254876-disallow_degenerate_chains-RZRFZAKDEJ

Reason for revert: Breakage fixed

Reverted changes: /q/submissionid:3260534-revert-3254876-disallow_degenerate_chains-RZRFZAKDEJ

Change-Id: I972b9b0cae932cc39be3f8d44ac59f82e878ca53
2024-09-10 22:41:53 +00:00
Treehugger Robot
f6831c8419 Merge "audio: Fix observable/hardware position check in VTS" into main 2024-09-10 18:03:39 +00:00
Tommy Chiu
b501642820 Correct the UDS_pub source
The UDS_pub is supposed to be the first element of DiceCertChain
according to generateCertificateRequestV2.cddl.

Bug: 365711214
Test: rkp_factory_extraction_tool
Change-Id: I454a99058d92ce9743810a9334c7ccacccc694e0
2024-09-10 10:15:47 +00:00
Priyanka Advani (xWF)
704df56108 Merge "Revert "Optionally (dis)allow degenerate DICE chains in verifyCsr"" into main 2024-09-09 20:57:18 +00:00
Priyanka Advani (xWF)
ebc265f0bc Revert "Optionally (dis)allow degenerate DICE chains in verifyCsr"
Revert submission 3254876-disallow_degenerate_chains

Reason for revert: Droidmonitor created revert due to b/365592588.

Reverted changes: /q/submissionid:3254876-disallow_degenerate_chains

Change-Id: I31f78d6c708f34f0a6fe9f54daef82981a91ac8f
2024-09-09 20:44:24 +00:00
Karuna Wadhera
f3d44a7bac Merge "Optionally (dis)allow degenerate DICE chains in verifyCsr" into main 2024-09-09 18:18:27 +00:00
Shreshta Manu
f4a9ca843b Merge "[uwb] Enable vts test for getDeviceInfo" into main 2024-09-09 17:12:08 +00:00
Vick Wang
1d4c1194b9 Merge "Suppress ThreadNetwork HAL debug log on user build" into main 2024-09-09 09:38:37 +00:00
Vick Wang
a34d52933a Suppress ThreadNetwork HAL debug log on user build
Due to security concerns, ThreadNetwork HAL service's debug log should
not be visible on user builds.

The "debuggable" field defines the flags that will be applied to
userdebug/eng variant builds.

Bug: 359338609
Test: No debug log from android.hardware.threadnetwork-service in logcat
Change-Id: I13993191efd3841fc8db1888be7c59c86f6608d3
2024-09-09 13:39:28 +08:00
Shreshta Manu
28ba6d7b40 [uwb] Enable vts test for getDeviceInfo
Bug: 359203552
Test: atest VtsHalUwbTargetTest
Change-Id: I1040efcba922a6bf7961dd74f69b2b6bbc58cb40
2024-09-08 16:17:59 +00:00
Xin Li
8c87752c05 Merge "Merge 24Q3 to AOSP main" into main 2024-09-07 01:12:09 +00:00
Karuna Wadhera
39de0cb35b Optionally (dis)allow degenerate DICE chains in verifyCsr
Bug: 323246910
Test: atest libkeymint_remote_prov_support_test & manual testing of
 `rkp_factory_extraction_tool` with/without `allow_degenerate=false` on a
 device with a degenerate DICE chain
Change-Id: Ia1833c0bb6a895ae5b8aefea24850a41cf956f38
2024-09-06 19:10:04 +00:00
Handa Wang
1daff456fd Merge "Fix the build error of openthread sync" into main 2024-09-06 08:07:41 +00:00
Handa Wang
876b83e70a Fix the build error of openthread sync
Bug: 364961251
Change-Id: I085715250171531801d3e486f75cfb324c0517fa
2024-09-06 02:22:50 +00:00
Treehugger Robot
4eb6ad095e Merge "Revert "Revert "Convert hardware/interfaces/compatibility_matric..."" into main 2024-09-06 00:48:26 +00:00
Xin Li
89a765c3e6 Merge 24Q3 to AOSP main
Bug: 357762254
Merged-In: I4a94280ef2ff63b569d43d8cd90de5a8f2058be9
Change-Id: I4b4d96a53d4016dd7c5cf4799cca5dc4d156b6f7
2024-09-05 17:02:53 -07:00
Mikhail Naganov
b7f45516fe Merge changes from topic "CAP_AIDL_AUDIO_HAL" into main am: 6e26bafe55
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3016651

Change-Id: I55f64f2d0e69ee378da3eb501afc85c70a6e8f1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-05 21:06:46 +00:00
François Gaffie
1a8da88acb Migrate forced config and for force use to android.media.audio.common.types am: 32aa870a21
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3210851

Change-Id: I5852e0d1cd4b698033228cdf3868e77460af60da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-05 21:06:40 +00:00
Mikhail Naganov
6e26bafe55 Merge changes from topic "CAP_AIDL_AUDIO_HAL" into main
* changes:
  Add missing Cap Settings aidl support and helper
  Migrate forced config and for force use to android.media.audio.common.types
2024-09-05 20:54:26 +00:00
Bart Van Assche
3ca376b972 Merge changes If286ae5d,I0c89907e into main am: 1de01e677c
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3250620

Change-Id: I292edeb5f5ebb8b4fd2c20af275f7c59024bbf5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-05 16:11:51 +00:00
Bart Van Assche
1de01e677c Merge changes If286ae5d,I0c89907e into main
* changes:
  libhealthloop: Reduce the size of the uevent receive buffer
  libhealthloop: Modify receive buffer overflow handling
2024-09-05 16:08:53 +00:00
Bill Yang
b7995ac8bc Revert "Revert "Convert hardware/interfaces/compatibility_matric..."
Revert submission 3235656-revert-3195743-compatibility_matrix-KLJOLWYIMW

Reason for revert: The root cause of the break is already be merged. Related changes: ag/29139095, ag/29139608

Reverted changes: /q/submissionid:3235656-revert-3195743-compatibility_matrix-KLJOLWYIMW

Change-Id: I6ef91cbf72f63013778056183e0997d5ece06854
2024-09-05 09:22:14 +00:00
Kiyoung Kim
2f1f91b21c Merge "Reapply "Define vintf_fragments as modules"" into main am: 8ab55b0607
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3250076

Change-Id: I8ee17854c735e0ece3b57e1d132bb5904cf34ab8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-05 04:10:43 +00:00
Kiyoung Kim
8ab55b0607 Merge "Reapply "Define vintf_fragments as modules"" into main 2024-09-05 03:58:09 +00:00
Devin Moore
0b3e274658 [automerger skipped] Revert "CameraVTS: build with static libhidlbase" am: 1090663558 -s ours
am skip reason: Merged-In I4a94280ef2ff63b569d43d8cd90de5a8f2058be9 with SHA-1 8ac9e1b75e is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3255604

Change-Id: Idd2c225ea675eebe12782ad44b43251651ebaa29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-05 00:01:01 +00:00
Devin Moore
1090663558 Revert "CameraVTS: build with static libhidlbase"
This reverts commit ca6839888e.

Reason for revert: This is likely the cause of b/357792919 and no longer needed for the camera test cases since they have their own defaults.

Merged-In: I4a94280ef2ff63b569d43d8cd90de5a8f2058be9
Change-Id: I4a94280ef2ff63b569d43d8cd90de5a8f2058be9
(cherry picked from commit 8ac9e1b75e)
2024-09-04 23:22:52 +00:00
Treehugger Robot
cff6c7e92a Merge changes I707ea158,Ic1c489dd,I7484b772 into main am: 1089648b97
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3250618

Change-Id: Id95c6f2860598130b127dcfaa7df5e66b88876f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-04 23:20:20 +00:00
Treehugger Robot
1089648b97 Merge changes I707ea158,Ic1c489dd,I7484b772 into main
* changes:
  libhealthloop: Use designated initializers
  libhealthloop: Reduce the number of ScheduleBatteryUpdate() calls
  libhealthloop: Terminate KLOG messages with a newline
2024-09-04 23:15:41 +00:00
Treehugger Robot
4b68e852f8 Merge "audio: Clarify that MMap h/w position must be continuous" into main am: 9b012da175
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3255438

Change-Id: Icb485155db2a21d9a909f89714d5f311f8b1f31c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-04 18:12:54 +00:00
Treehugger Robot
9b012da175 Merge "audio: Clarify that MMap h/w position must be continuous" into main 2024-09-04 18:01:46 +00:00
Mikhail Naganov
189cd6a599 audio: Clarify that MMap h/w position must be continuous
The VTS test already verifies that the MMap hardware position
never resets or goes back, but the official wording in the AIDL
interface was lacking.

Bug: 350998390
Bug: 363139283
Test: none, doc change
Change-Id: I07b9842f53c89549fe648ee839d875d31a7a849d
2024-09-04 10:11:59 -07:00
Bart Van Assche
4187755208 libhealthloop: Reduce the size of the uevent receive buffer
The HealthLoop code only checks the name of the subsystem in the uevents
that it receives. Since the recently added BPF filter only passes power
supply uevents, all we need to know is whether or not any such uevents
have been received. We do not need to know how many of these events have
been received. Hence, reduce the size of the uevent receive buffer.
This CL reduces the number of ScheduleBatteryUpdate() calls if uevents
are received faster than these can be processed.

Bug: 362986353
Change-Id: If286ae5d05a95d59bc637a869c94d5c5472b5be2
Signed-off-by: Bart Van Assche <bvanassche@google.com>
2024-09-04 09:34:01 -07:00
Bart Van Assche
32a9bfec7b libhealthloop: Modify receive buffer overflow handling
Let epoll_wait() wake up healthd if a receive buffer overflow has
happened. If a receive buffer overflow happened, this indicates that one
or more power supply uevent messages have been discarded. Handle this by
updating the battery statistics. This is the approach recommended in the
netlink(7) man page. From that manual page: "However, reliable
transmissions from kernel to user are impossible in any case. The kernel
can't send a netlink message if the socket buffer is full: the message
will be dropped and the kernel and the user-space process will no longer
have the same view of kernel state.  It is up to the application to
detect when this happens (via the ENOBUFS error returned by recvmsg(2))
and resynchronize."

Bug: 362986353
Change-Id: I0c89907eaa014f9e2859a73b29239e82f066f03f
Signed-off-by: Bart Van Assche <bvanassche@google.com>
2024-09-04 09:30:38 -07:00
Devin Moore
4021836b0f Merge "Revert "CameraVTS: build with static libhidlbase"" into main am: eb39ea1855
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3252935

Change-Id: I03e31ce7e0b8d2fbf476929b2e07016cae8ca7c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-04 15:35:47 +00:00
Devin Moore
eb39ea1855 Merge "Revert "CameraVTS: build with static libhidlbase"" into main 2024-09-04 15:25:40 +00:00
Kiyoung Kim
4a518d2e1e Reapply "Define vintf_fragments as modules"
Previous commit was reverted as it removed wifi vintf fragment from
devices, which was caused by 'no_full_install' property from
vintf_fragment module. This change relands the change, with removing
no_full_install property from the vintf_fragment module

Bug: 322089980
Test: aosp_cf_x86_64_phone build succeeded
Test: mokey_go32 build contains
/vendor/etc/vintf/manifest/android.hardware.wifi.supplicant.xml file

Change-Id: I523ce570068b180805b65f984a0d6def0612db87
2024-09-04 15:55:29 +09:00
Bart Van Assche
7a3762cbdd libhealthloop: Make the filterPowerSupplyEvents unit test easier to maintain am: b8e15ebaa8
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3252944

Change-Id: I8c8ad71bc7b072652c3e62fbe3d6cff540ad681e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-04 02:22:27 +00:00
Bart Van Assche
7b7948b1d5 libhealthloop: Use designated initializers
Make the code somewhat easier to read by using designated initializers.
No functionality has been changed.

Bug: 362986353
Change-Id: I707ea158c9c45eeb2662d7b5c1efc9b63f0375cb
Signed-off-by: Bart Van Assche <bvanassche@google.com>
2024-09-03 17:01:44 -07:00
Bart Van Assche
b8e15ebaa8 libhealthloop: Make the filterPowerSupplyEvents unit test easier to maintain
Instead of hard-coding input lengths, let the compiler calculate the
input length.

Change-Id: I47d849b85dd983706bfada0293ccbdd04c8a597a
Signed-off-by: Bart Van Assche <bvanassche@google.com>
2024-09-03 17:01:44 -07:00
Bart Van Assche
5264619177 libhealthloop: Reduce the number of ScheduleBatteryUpdate() calls
Instead of calling ScheduleBatteryUpdate() every time a uevent has been
received, only call it after the netlink socket receive buffer has been
drained. This change is safe because the contents of the power supply
uevent messages is ignored.

A subtle change in this CL is that an additional call to
uevent_kernel_multicast_recv() is introduced after all the receive
buffer has been drained. In case of a receive buffer overflow, this
extra call will receive and clear the socket error (sk_err).

Bug: 362986353
Change-Id: Ic1c489dde3338f0142def743b4cd654363517486
Signed-off-by: Bart Van Assche <bvanassche@google.com>
2024-09-03 17:01:44 -07:00