Commit Graph

41634 Commits

Author SHA1 Message Date
Michael Butler
fa712a0efb [automerger skipped] Handle case where NN AIDL callback is null in IDevice::prepareModel* am: 7c0353f8e4 -s ours
am skip reason: Merged-In I4a15d02c4879a0261ec26cc0e7a47d0a4da86b8b with SHA-1 d6f6d01499 is already in history

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

Change-Id: If06c912ca944a1c4769e0430f422618598afed91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 05:05:16 +00:00
Changyeon Jo
7dd21a7d85 Merge "Update CameraStreamBuffering test case" into tm-dev am: df2bcbe6e2
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/17915087

Change-Id: I85bbf6e620aef937734ba918c50dad420145b727
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 22:21:38 +00:00
Changyeon Jo
df2bcbe6e2 Merge "Update CameraStreamBuffering test case" into tm-dev 2022-05-02 21:57:32 +00:00
Changyeon Jo
0d814ce524 Update CameraStreamBuffering test case
CameraStreamBuffering test case intentionally calls
setMaxFramesInFight() with very large integer value to verify that API
handles unreasonaly large value properly.  A type of its parameter is
changed from unsigned 32-bit integer to signed 32-bit integer in the
latest EVS interface definition written in the stable AIDL.  To adapt a
test case, this CL updates it to use std::numeric_limits<int32_t>::max()
instead of 0xFFFFFFFF, which is translated as -1 in signed 32-bit integer
format.

Bug: 226628778
Test: atest VtsHalEvsV1_1TargetTest
      atest VtsHalEvsTargetTest
Change-Id: Ic35c6c962617825bc271cec8544770340db7728a
2022-04-30 11:40:17 +00:00
Michael Butler
7c0353f8e4 Handle case where NN AIDL callback is null in IDevice::prepareModel*
Prior to this change, if IDevice::prepareModel* was passed a null
callback, the code would still attempt to call "notify" on the callback
to return the error to the client. This CL ensures the "notify" method
will not be invoked if the callback is null.

Bug: 230914930
Test: mma
Test: presubmit
Change-Id: I4a15d02c4879a0261ec26cc0e7a47d0a4da86b8b
Merged-In: I4a15d02c4879a0261ec26cc0e7a47d0a4da86b8b
(cherry picked from commit d6f6d01499)
2022-04-29 23:39:27 +00:00
TreeHugger Robot
cb398fca7d Merge "fix first_api_level property fail in VF projects" into tm-dev am: dd890b5845
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/18092208

Change-Id: Ibb5371ba9666682977065d9bcc63245009cba394
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 23:02:14 +00:00
Steven Moreland
5ca6f2a379 Merge "Revert "Disable current matrix."" into tm-dev-plus-aosp 2022-04-29 22:52:08 +00:00
TreeHugger Robot
dd890b5845 Merge "fix first_api_level property fail in VF projects" into tm-dev 2022-04-29 22:45:17 +00:00
Treehugger Robot
b05ca284c1 [automerger skipped] Merge changes from topic "freeze-t-kernel-configs" am: 6d8dcd4aba am: c7be910b99 -s ours
am skip reason: Merged-In I2c6b1a1d5ec81acfb60380efeca0e6ee24b33089 with SHA-1 e8981922a4 is already in history

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

Change-Id: Iad214337dcecfe8d936e39ffb99385a315ca806d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 21:19:13 +00:00
Steven Moreland
0a4cb8fc8c [automerger skipped] Freeze compat matrix 7 for Android T am: d901ed003e am: 201cbf125a -s ours
am skip reason: Merged-In I5c04d26e2b4dd0aac6e7d6ce3c72496081e9539d with SHA-1 953448bb3b is already in history

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

Change-Id: I9a8ef08b55a909414066eee6b711eacfed8c0a48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 21:19:11 +00:00
Treehugger Robot
c7be910b99 Merge changes from topic "freeze-t-kernel-configs" am: 6d8dcd4aba
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2078373

Change-Id: Ib9911515a39909fd0ee405aceb27e822be310a4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 20:53:40 +00:00
Steven Moreland
201cbf125a Freeze compat matrix 7 for Android T am: d901ed003e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2072473

Change-Id: I34767385a6e13cacfdebf41251d11c545ed7f3c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 20:53:38 +00:00
Steven Moreland
3f51f6e447 Revert "Disable current matrix."
This reverts commit e7938a23bb.

Reason for revert: re-enable change aosp/master .. goog/master

Change-Id: I9ca426ff3bc8f144e81fb7013102e8b0fa1fb63d
2022-04-29 20:40:41 +00:00
Treehugger Robot
6d8dcd4aba Merge changes from topic "freeze-t-kernel-configs"
* changes:
  Freeze kernel configs for Android T.
  Freeze compat matrix 7 for Android T
2022-04-29 20:25:28 +00:00
Michael Butler
d1a658d9a6 [automerger skipped] Merge "Do not call releaseMemoryResource on ignored slot in NN VTS" am: 186a90a5e9 am: 61a97f843d -s ours
am skip reason: Merged-In I82e538aa0fd9e8ecc077df1c1ceece46a6166e67 with SHA-1 d468abed9b is already in history

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

Change-Id: Ibe1c85d97b31d48465742fc16c998c88b367bf1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 19:21:08 +00:00
Treehugger Robot
20b388d718 Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/interfaces" am: 35e0793669 am: 4d3b1be31b
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2079942

Change-Id: Ifd7fe7c62d9e77cffd50a9e912110ee650d362b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 19:20:52 +00:00
Seth Moore
76626c0bda Clean up keymint ProtectedData documentation am: 1d389acec8 am: 19eff513d4
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2075940

Change-Id: Ic9334c1ab5fa1faadec1f399a70b86933d41ddd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 19:20:00 +00:00
Michael Butler
61a97f843d Merge "Do not call releaseMemoryResource on ignored slot in NN VTS" am: 186a90a5e9
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2076053

Change-Id: I47d1d208d832c79fba47ee2ec80cd1ebc208c0c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:52:36 +00:00
Treehugger Robot
4d3b1be31b Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/interfaces" am: 35e0793669
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2079942

Change-Id: I87e174bf2e1b139b878a52bdb1830d9f6995d95c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:52:06 +00:00
Seth Moore
19eff513d4 Clean up keymint ProtectedData documentation am: 1d389acec8
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2075940

Change-Id: I1b62e15a829b1baa3c53b1fdc8533f9e82ed266b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:51:57 +00:00
Michael Butler
12adc10cfd Merge "Move NN_TRY macro out of struct initialization" into tm-dev am: 13300287b5
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/17991614

Change-Id: Ibf2ed6b11978b524307f1d4209404a32c73c6ceb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:32:20 +00:00
TreeHugger Robot
b351c565e1 Merge "Added supportedAreas for CRITICALLY_LOW_TIRE_PRESSURE" into tm-dev am: 1eb9ba70b8
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/17945144

Change-Id: I35dcc5dd7c75c9a02526f313212008b7deab3b04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:32:05 +00:00
Steven Moreland
0e16ecfd7b Merge "DO NOT MERGE: Disable current matrix." into tm-dev am: b5bb158d20
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/17920399

Change-Id: I15355ab9ade933431f09b08cb5f8fc96889e31d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:31:56 +00:00
Steven Moreland
9de287a8ce DO NOT MERGE: Disable current matrix. am: e7938a23bb
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/17920399

Change-Id: I18cfd7ceeadd8229fc04b35995aabd17af7e4aca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:31:54 +00:00
TreeHugger Robot
fc27380b8f Merge "Clarify measurement interval documentation" into tm-dev am: 58178fd1b7
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/17988968

Change-Id: I6f3bf38f736d9ee3545ff6accc47112f64fc3e71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:31:44 +00:00
Michael Butler
186a90a5e9 Merge "Do not call releaseMemoryResource on ignored slot in NN VTS" 2022-04-29 18:31:19 +00:00
Michael Butler
13300287b5 Merge "Move NN_TRY macro out of struct initialization" into tm-dev 2022-04-29 18:06:29 +00:00
Treehugger Robot
45759188e9 Merge "Disable FilterTest/1#FilterOutNonVendorTags on HWASan." am: e19d685e2f am: 3aded47933
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2076912

Change-Id: Id1d2f0cc9b92673b530a7e97200f381d251dd13f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:06:27 +00:00
Guanwei Chen
e644bb509e fix first_api_level property fail in VF projects
Should use "ro.board.first_api_level" for vendor freeze project

Bug: 228778569
Test: run cts VtsHalMediaOmxV1_0TargetStoreTest pass

Change-Id: Ib46206be6267a44aaa0a8235a4f017569bb4de94
(cherry picked from commit a8c914ae69)
Merged-In: Ib46206be6267a44aaa0a8235a4f017569bb4de94
2022-04-29 18:04:42 +00:00
Treehugger Robot
fd210c40d9 [automerger skipped] Merge changes from topic "227137943" am: 31aef21ec8 am: 7ae76339be -s ours
am skip reason: Merged-In I49881d136697cd5f207a61e179779b532d0d8e76 with SHA-1 aef9dec7dd is already in history

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

Change-Id: Ib32710ccd3b10c3ac079173e54d3f0e9044fb93e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:01:41 +00:00
Badhri Jagan Sridharan
9c027033ad [automerger skipped] Migrate IUsb to AIDL am: 99ecbd7b81 am: 94f65653b4 -s ours
am skip reason: Merged-In Id8aa40682d4c4b435c63b3ae249b176276dbb31d with SHA-1 b9f69ea776 is already in history

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

Change-Id: I39582842e37a2e9ecf002ea9ac7f149a41ee0460
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:01:31 +00:00
TreeHugger Robot
1eb9ba70b8 Merge "Added supportedAreas for CRITICALLY_LOW_TIRE_PRESSURE" into tm-dev 2022-04-29 00:24:12 +00:00
Steven Moreland
b5bb158d20 Merge "DO NOT MERGE: Disable current matrix." into tm-dev 2022-04-28 23:04:33 +00:00
Michael Butler
7ecc290745 Move NN_TRY macro out of struct initialization
NNAPI NN_TRY macros use Statement Expressions (a GNU extension) to
propagate errors. However, a "return" statement in a Statement
Expression can lead to memory leaks when the Statement Expression is
being used to initialize a member of a struct. Specifically, when one member of a struct is already initialized, and a Statement Expression used to initialize a subsequent member early-returns, the previously initialized members will not have their destructors called.

This CL moves any NN_TRY macro out of struct initialization to avoid any
potential memory leaks.

Bug: 230500484
Test: mma
Test: presubmit
Change-Id: I3493fd4764f8eacc86750e6414e62bc891abaccd
2022-04-28 22:05:37 +00:00
TreeHugger Robot
58178fd1b7 Merge "Clarify measurement interval documentation" into tm-dev 2022-04-28 21:57:27 +00:00
Treehugger Robot
35e0793669 Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/interfaces" 2022-04-28 21:27:25 +00:00
Yu-Han Yang
d64dd7b6a8 Clarify measurement interval documentation
The GNSS chipset must report measurements at the requested rate if
location is not requested.

Bug: 206670536
Test: doc update only
Change-Id: I3b488f8b38def4b6ebf13733149d9b75b23db0cb
2022-04-28 13:00:33 -07:00
Seth Moore
1d389acec8 Clean up keymint ProtectedData documentation
- Fix up some minor CDDL formatting issues.
- Add more definition around the BCC, hopefully clearing up partner
  confusion around how to implement it.
- Explain when BccPayload entries may be omitted in the case of a
  "Degenerate BCC"
- Add a bit more description to the DKSignature format

Bug: 227350250
Test: N/A -- doc changes only
Change-Id: I28337a80e2b49661cc37876400d7ac3b8759ba01
2022-04-28 12:41:18 -07:00
Michael Butler
39dac4dee4 Do not call releaseMemoryResource on ignored slot in NN VTS
For IBurst, a slot value of -1 indicates the slot should be ignored.
However, GeneratedTestHarness still attempts to call
IBurst::releaseMemoryResource on ignored slots. Instead, we should skip
releasing any ignored slots.

Bug: 230103381
Test: mma
Test: VtsHalNeuralnetworksTargetTest
Test: presubmit
Change-Id: I82e538aa0fd9e8ecc077df1c1ceece46a6166e67
Merged-In: I82e538aa0fd9e8ecc077df1c1ceece46a6166e67
2022-04-28 18:58:46 +00:00
Bob Badour
9ad034df97 [LSC] Add LOCAL_LICENSE_KINDS to hardware/interfaces
Added SPDX-license-identifier-Apache-2.0 to:
  usb/aidl/Android.bp
  usb/aidl/default/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all
Change-Id: I3ea2a006619b896e9ebac0c54bba67c8a4bb1b29
2022-04-28 11:35:47 -07:00
Raju Kulkarni
c51a4fcafd Merge changes from topic "aidl-freeze-tm" into tm-dev am: c13dea1094
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/17983786

Change-Id: I25fef66f19397461c10ff07ba57be145196d96c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 16:57:24 +00:00
Raju Kulkarni
c13dea1094 Merge changes from topic "aidl-freeze-tm" into tm-dev
* changes:
  Finalize V2 of android.hardware.light
  Finalize V2 of android.hardware.biometrics.common
  Finalize V3 of android.hardware.power
  Finalize android.hardware.graphics.common-V3
2022-04-28 15:51:28 +00:00
TreeHugger Robot
ba40c77f52 Merge "Check and catch the callback transaction error" into tm-dev am: 1fd86d9b89
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/17945762

Change-Id: Ifbd90045a6ca38bd20152795fe75f23389784d5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 02:54:01 +00:00
TreeHugger Robot
1fd86d9b89 Merge "Check and catch the callback transaction error" into tm-dev 2022-04-28 02:10:35 +00:00
Michael Butler
7840b95dd6 Merge "Do not call releaseMemoryResource on ignored slot in NN VTS" into tm-dev am: cb2e758c92
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/17970068

Change-Id: I58d0f4dffda3ffac6f9fe81f08b0bec27454c04d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 01:06:41 +00:00
Steven Moreland
d901ed003e Freeze compat matrix 7 for Android T
This CL is modified by downstream, so that only the HALs which are
on AOSP are included in the manifest.

Bug: 203103997
Test: boot, vts_treble_vintf_vendor_test
Change-Id: I5c04d26e2b4dd0aac6e7d6ce3c72496081e9539d
Merged-In: I5c04d26e2b4dd0aac6e7d6ce3c72496081e9539d
2022-04-27 17:56:21 -07:00
Yifan Hong
2e1716a2f9 Freeze kernel configs for Android T.
Use the frozen kernel configs, not the 'current'
unfrozen kernel configs.

Test: TH
Fixes: 230144764
Change-Id: I2c6b1a1d5ec81acfb60380efeca0e6ee24b33089
Merged-In: I2c6b1a1d5ec81acfb60380efeca0e6ee24b33089
2022-04-27 17:56:21 -07:00
Michael Butler
cb2e758c92 Merge "Do not call releaseMemoryResource on ignored slot in NN VTS" into tm-dev 2022-04-28 00:48:04 +00:00
Steven Moreland
e7938a23bb DO NOT MERGE: Disable current matrix.
The current matrix should not be used in Android T. However, it is left
here so that any late fixes to the T matrix can be made in a way that
will flow downstream.

Reason for 'DO NOT MERGE' - avoid landing this change in goog/master,
since the current matrix has HALs added there, some devices may be
relying on it.

In order to allow the (AOSP subset of) the T manifest to be frozen in
AOSP, and the current matrix to be enabled from aosp/master -..->
goog/master, this will be reverted in tm-dev-plus-aosp immediately after
it merges.

Bug: 203103997
Test: boot devices and vts_treble_vintf_vendor_test passes
Change-Id: I15bacedd0820e0086a742b97ee18e097ef8086e5
2022-04-28 00:38:24 +00:00
Jiyong Park
ac70f417cc Finalize V2 of android.hardware.light
It was missing in the prior attempt to finalize all AIDL interfaces.

Bug: 230660133
Test: m nothing with https://googleplex-android-review.git.corp.google.com/q/topic:Tiramisu-SDK-Finalization-rel
Change-Id: I5e105fc4176ab326c40ee2297cab59be83c34351
2022-04-28 08:56:28 +09:00