Commit graph

120 commits

Author SHA1 Message Date
Jooyung Han
3d66ca3689 Cleanup: use shared apex_key
Bug: 296524155
Test: m
Change-Id: I353d4803d0e6bd16d4a5617ca7790d33ff589747
2023-10-10 13:46:47 +09:00
Xin Li
a737141254 Merge "Merge Android 14" into main 2023-10-06 05:34:12 +00:00
Henri Chataing
7e798080c8 UWB: Cleanup in default HAL
Resolve comments on I8ad8072fe01c8d1f466d8debf0ccf5831b3eddf8

Bug: 302005209
Test: m android.hardware.uwb-service
Change-Id: I1c4348fa7548441555c46cac88c2e5787d764f03
2023-10-06 00:11:08 +00:00
Bob Wang
625d52ae10 Merge "[UWB HAL] Use AsyncFd to read the buffer only when it's readable." into main am: 4e3c5aca14
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2766185

Change-Id: I4665614ebfe72260217be365be89e2c2597e58bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03 17:45:25 +00:00
ziyiw
4fec12a6f0 [UWB HAL] Use AsyncFd to read the buffer only when it's readable.
This CL fixes the issue that some bytes are missing after we toggle uwb
off and on.

Test: atest CtsUwbTestCases
Bug: 302005209

Change-Id: I8ad8072fe01c8d1f466d8debf0ccf5831b3eddf8
2023-10-03 00:58:04 +00:00
Xin Li
879960bdce Merge Android U (ab/10368041)
Bug: 291102124
Merged-In: I7b6fffac2ada0e039f79bad8cc9b4d954e9c3460
Change-Id: I9466127d8d0fa38df36ca99f704853b2db871e67
2023-08-25 13:29:30 -07:00
Jooyung Han
83497068b9 Move uwb-service into VAPEX
Bug: 296487624
Test: launch cuttlefish / uwb-service runs
Change-Id: I5436d9215ad396fe6cd151690d299dd345c56cb0
2023-08-21 15:12:07 +09:00
Jooyung Han
3e0519690f Move uwb-service.rc
Previously, .rc file is installed separately. Now it's installed as part
of the uwb-service binary installation.

Bug: 296487624
Test: launch cuttlefish / uwb-service runs with /dev/hvc9
Change-Id: I49108c74a5ca964818c90407cc7916d80439d5ab
2023-08-21 12:57:20 +09:00
Henri Chataing
77971b371b uwb: Rewrite implementation of sendUciMessage to use the opened File
The current implementation used fs::write() as workaround since
the write permission was missing from the fs::open() invocation

Test: m android.hardware.uwb-service
Change-Id: Ifdb460843fcb9525ad498f928b1dc2ed9beb5410
2023-08-16 17:10:20 +00:00
Shreshta Manu
595041e6fb [uwb-interfaces] Add support for prioritized channel list
Test: compiles
Bug: 293959095
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:cef396ca26136d812405e78009e7a1374ca89e5c)
Merged-In: I18da378128b96b73ae457045354d22a4add988d0
Change-Id: I18da378128b96b73ae457045354d22a4add988d0
2023-08-08 20:08:45 +00:00
Jin Chen
1b1aa3bb9a [uwb](hal) Add radar data packet format
* Update based on Android UWB radar UCI spec v1.1 (go/uwb-radar-uci).

Test: Compile
Bug: 237097302
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:86974637e8e2a447a527ac828bf27958c008b339)
Merged-In: I8e8de979ea2f69396b049c2107cba16e71793cb0
Change-Id: I8e8de979ea2f69396b049c2107cba16e71793cb0
2023-07-13 18:09:02 +00:00
Jin Chen
cb3c1de918 [uwb](hal) Add radar support
* Adding radar session type, capabilities, oids, and app configs based
  on the Android UWB radar UCI spec v1.0.

Test: Compile
Bug: 237097302
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:db326d178686dd981dbb81804534b51502392ae2)
Merged-In: Ia0b901859b38127db8532118f2427338fdf502a8
Change-Id: Ia0b901859b38127db8532118f2427338fdf502a8
2023-06-28 21:11:53 +00:00
Charlie Boutier
032c7153b2 Merge "Uwb Hal: use fs::write instead of File::write" am: 995445a080 am: ccd01a2756 am: 9329fd19e0
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2575093

Change-Id: I816a308e2c120f63441f96a8b743f91812713ac5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 21:47:11 +00:00
Charlie Boutier
3561c84d77 Uwb Hal: use fs::write instead of File::write
Test: launch_cvd -enable_host_uwb
Change-Id: I1f9038f585ca79c33b8168db69da0e71fa414c6d
2023-05-02 00:06:28 +00:00
Charlie Boutier
25d2f7f4ff Merge "Revert "Revert "uwb(hal): Implement UCI over serial in the defau..."" am: 29567e796b am: 57cccf0cd7 am: 33fc82390c
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2530005

Change-Id: If6bce69d107ce972ba6d96a8af626d2d6ac20f77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-18 00:07:08 +00:00
Charlie Boutier
29567e796b Merge "Revert "Revert "uwb(hal): Implement UCI over serial in the defau..."" 2023-04-17 23:22:04 +00:00
Charlie Boutier
d572dd0bc7 Revert "Revert "uwb(hal): Implement UCI over serial in the defau..."
Revert submission 2528605-revert-2215484-pica_cf-BZDQSZLKEP

Reason for revert: revert^2

Reverted changes: /q/submissionid:2528605-revert-2215484-pica_cf-BZDQSZLKEP

Change-Id: I0c64b449c5da236a7cd63f88a605d48b9c471c67
2023-04-10 18:14:23 +00:00
Sam Wu
62531b1267 Merge "Revert "uwb(hal): Implement UCI over serial in the default HAL"" am: 9f8fac2faa am: d567cecdbb am: 57f9808c23
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2528604

Change-Id: I0603d78b7565d868c4044e219abcc401d9df4f77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-08 01:25:05 +00:00
Sam Wu
9f8fac2faa Merge "Revert "uwb(hal): Implement UCI over serial in the default HAL"" 2023-04-07 23:45:06 +00:00
Sam Wu
63bcd88052 Revert "uwb(hal): Implement UCI over serial in the default HAL"
Revert submission 2215484-pica_cf

Reason for revert: DroidMonitor: Potential culprit for Bug X - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Reverted changes: /q/submissionid:2215484-pica_cf

Change-Id: Ifd9f5cf04631e19a33b29b4b2917eaab2b506e23
2023-04-07 18:35:20 +00:00
Charlie Boutier
9eb209dce8 Merge "uwb(hal): Implement UCI over serial in the default HAL" am: 77ee578477 am: d0e586d474 am: 20abb491c8
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2215484

Change-Id: Ia894b0a5598abb18fb3a02e6d8f17f78dde011bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-06 17:29:27 +00:00
Charlie Boutier
77ee578477 Merge "uwb(hal): Implement UCI over serial in the default HAL" 2023-04-06 16:09:27 +00:00
ziyiw
46b5ac8692 Add min uwb initiation time as new vendor capability.
Test: manual
Bug: 245854896
Merged-In: I640b54356d4a7dc338d995596147aa6716278b54
Change-Id: I12436cad527255d8f88e9ca34409aee0a59b3c92
2023-04-04 20:06:49 +00:00
ziyiw
090e46a17f [automerge] Add min uwb initiation time as new vendor capability. 2p: 2f83e56e61
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/22399100

Bug: 245854896
Change-Id: I8507e1257fe809ad0db8c184c1638cfa4396f66c
2023-04-03 20:34:07 +00:00
ziyiw
2f83e56e61 Add min uwb initiation time as new vendor capability.
Test: manual
Bug: 245854896
Change-Id: I640b54356d4a7dc338d995596147aa6716278b54
2023-04-03 20:31:44 +00:00
David Duarte
e432bdd45b uwb(hal): Implement UCI over serial in the default HAL
Bug: 229824143
Test: manual with cuttlefish
Change-Id: Ia29e618b8c9b53f295f66ff0b94965d4f571f8e4
2023-04-03 17:32:44 +00:00
Roshan Pius
cca5eefb32 uwb[aidl]: Added LAST_STS_INDEX_USED config into CCC open ranging params
Add LAST_STS_INDEX_USED to CCC ranging

Bug: 268762844
Test: test CCC
Merged-In: I56514e7d7d0c927e6bf8e257547f7baeadd3770c
Change-Id: I56514e7d7d0c927e6bf8e257547f7baeadd3770c
2023-03-28 11:52:18 -07:00
Roshan Pius
fff90a26ae [automerge] uwb[aidl]: Added LAST_STS_INDEX_USED config into CCC open ranging params 2p: 9bd47ef77c
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/22292494

Bug: 268762844
Change-Id: I5cc5234025cfd386e122825eb5cc081df98d3dd0
2023-03-27 16:41:27 +00:00
Roshan Pius
9bd47ef77c uwb[aidl]: Added LAST_STS_INDEX_USED config into CCC open ranging params
Add LAST_STS_INDEX_USED to CCC ranging

Bug: 268762844
Test: test CCC
Change-Id: I56514e7d7d0c927e6bf8e257547f7baeadd3770c
2023-03-27 09:40:12 -07:00
ziyiw
617c2baaaa Add new reason code and status code for session conflict.
Also assigned a new number to the UWB regulation off status/reason code.

Test: compile
Bug: 272361935
Merged-In: I4cbf2443d7e3ec914ee465d9128fef5225a74712
Change-Id: Ib219ea213be050944a0bbd601f79ccbbba18f299
2023-03-14 19:58:03 +00:00
ziyiw
1c2d1bda32 [automerge] Add new reason code and status code for session conflict. 2p: fbe75bbcf1
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/21996393

Bug: 272361935
Change-Id: If679383a5b702334dc490e25c53755458947a158
2023-03-14 00:20:21 +00:00
ziyiw
fbe75bbcf1 Add new reason code and status code for session conflict.
Also assigned a new number to the UWB regulation off status/reason code.

Test: compile
Bug: 272361935
Change-Id: I4cbf2443d7e3ec914ee465d9128fef5225a74712
2023-03-14 00:17:23 +00:00
Ayush Jain
471879fcfe Merge "Add a Vendor-dependent UCI Reason code for UWB OFF" into tm-mainline-prod 2023-03-03 22:41:43 +00:00
Ayush Jain
93752a76ff Merge changes from topic "presubmit-am-de536539e6c7464a871423c40221150c" into udc-dev
* changes:
  [automerge] Add a Vendor-dependent UCI Reason code for UWB OFF 2p: ff9268b13b
  Add a Vendor-dependent UCI Reason code for UWB OFF
2023-03-03 22:41:43 +00:00
Presubmit Automerger Backend
5c7f972d00 [automerge] Add a Vendor-dependent UCI Reason code for UWB OFF 2p: ff9268b13b
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/21683422

Bug: 267554906
Change-Id: Iaac1b79eb02ecc621b7423650abb2ef1e0bb9d2a
2023-03-01 23:02:13 +00:00
Ayush Jain
ff9268b13b Add a Vendor-dependent UCI Reason code for UWB OFF
Add a UCI reason code (sent in a SESSION_STATUS_NTF) for the scenario when UWB needs to be turned off due to Regulatory reasons.

Ran the "m android.hardware.uwb.fira_android-update-api" command to
update the generated AIDL API.

Bug: 267554906
Test: Compile make.com.google.android.uwb
Change-Id: I52d9f2dae203c3e2d3d26a8a5c30a2f2a969b591
2023-03-01 23:00:44 +00:00
Presubmit Automerger Backend
2667c1edcf [automerge] Add a Vendor dependent UCI Status code for UWB OFF 2p: 3f884a8b91
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/21677124

Bug: 267554906
Change-Id: I63d931a83e2654b28ec180dd2fd9b02524606072
2023-03-01 19:54:51 +00:00
Ayush Jain
3f884a8b91 Add a Vendor dependent UCI Status code for UWB OFF
Add a UCI status code for scenario when UWB needs to be turned off due
to Regulatory reasons.

Ran the "m android.hardware.uwb.fira_android-update-api" command to
update the generated AIDL API.

Bug: 267554906
Test: Compile make.com.google.android.uwb
Change-Id: I5f86007776479fefe2d3b3e36d16ef628f92cebd
2023-03-01 19:53:12 +00:00
ziyiw
3b1252c88c Change the unit of slot duration from ms to rstu.
Test: compile
Bug: 266980744
Merged-In: Iba643094f9d44293e47b68487aeae30847af4826
Change-Id: I255b46d110d1a30a548fc37a479c1fc62b770f14
2023-02-28 17:29:27 +00:00
Presubmit Automerger Backend
732b749231 [automerge] Change the unit of slot duration from ms to rstu. 2p: 40bc040455
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/21546973

Bug: 266980744
Change-Id: I73b4a1286b3f3b4ee28f9612737e39e93ef47972
2023-02-23 04:10:02 +00:00
ziyiw
40bc040455 Change the unit of slot duration from ms to rstu.
Test: compile
Bug: 266980744
Change-Id: Iba643094f9d44293e47b68487aeae30847af4826
2023-02-23 04:09:36 +00:00
ziyiw
8ad5f800c2 [UWB HAL] Add new capability and reason code to show the channels that are capable for AoA.
Test: compile
Bug: 242951474
Merged-In: I307062b7ded64014327549e8c4a717d53e97f54b
Change-Id: Ia9c801cce335214cbfc0b09c8d5498193c741dfa
2023-02-17 19:07:11 +00:00
ziyiw
5363e6a547 Add the unit of slot duration to its name.
Test: compile
Bug: 266980744
Merged-In: I1418b7a1b9e938b03e785cb1b2b4c92a8f4c9ecf
Change-Id: Ie0e8e983c2044721b25c076c24a02f6460923571
2023-02-17 19:06:26 +00:00
Bob Wang
132345cbac Merge changes from topics "min-slot-duration", "presubmit-am-9b6b545e139045589d95a07642d6096d" into tm-mainline-prod am: c274bf47ba
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/21128238

Change-Id: Iff4ba37e0729442ab7f039cbfe92b4a30940e3ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-17 06:20:22 +00:00
ziyiw
420ae531b0 Add the unit of slot duration to its name. am: 9bf67194db
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/21161338

Change-Id: I288a772416f9283896fdf981096cd8cf01621049
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-17 06:20:18 +00:00
ziyiw
e7613eb815 [UWB HAL] Add new capability and reason code to show the channels that are capable for AoA.
Test: compile
Bug: 242951474
Change-Id: I307062b7ded64014327549e8c4a717d53e97f54b
2023-02-16 21:56:19 +00:00
ziyiw
9bf67194db Add the unit of slot duration to its name.
Test: compile
Bug: 266980744
Change-Id: I1418b7a1b9e938b03e785cb1b2b4c92a8f4c9ecf
2023-02-16 21:50:32 +00:00
Treehugger Robot
a56924244e Merge "uwb: Allow Java backened jar to be created" am: dbfdb659e0 am: 33034407ff am: eedf884325
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2420979

Change-Id: I8a502156dd3340e8ea9f0a8eceeadd7181abdee4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-09 22:30:20 +00:00
Bhautik Ardeshana
dd8a1ae2e7 uwb: Allow Java backened jar to be created
Bug: 254568115
Test: Check for jar file in intermediate path
Change-Id: I36c0c356a5300f8ba31a1ab9a812740a8ea99335
2023-02-03 10:45:09 +05:30
ziyiw
5f0d4c663e Add supported maximum number of ranging session as capability.
Test: compile
Bug: 259493075
Merged-In: Ibe7edb84c968b70be62059bb0bb6ffeedfa4bad6
Change-Id: I313fdd7e894be322105befd91a1fc92d28f8c402
2022-12-07 07:50:47 +00:00