Michael Butler
14c577fc22
Merge changes from topic "libneuralnetworks_common-cleanup" am: ee7a476090 am: f3ac53fa2a
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1878019
Change-Id: I39aa18d29f65b15dde9094d11d965b80d402179d
2021-11-03 19:13:30 +00:00
Michael Butler
4b45b7b234
Move Aidl utility code to aidl/utils -- hal 1/2 am: 8fa5383407 am: 937d71b102
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1878018
Change-Id: If257a6fd292ff7aec8d405c6a35c11f79e6f7c08
2021-11-03 19:13:29 +00:00
Michael Butler
f3ac53fa2a
Merge changes from topic "libneuralnetworks_common-cleanup" am: ee7a476090
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1878019
Change-Id: I3da9b3f8315c50379b4f95f060d15f6a8ae3274c
2021-11-03 18:47:29 +00:00
Michael Butler
937d71b102
Move Aidl utility code to aidl/utils -- hal 1/2 am: 8fa5383407
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1878018
Change-Id: I4dc6f6a75e1643ddb9fd1e673dedde70e366fff5
2021-11-03 18:47:28 +00:00
Michael Butler
ee7a476090
Merge changes from topic "libneuralnetworks_common-cleanup"
...
* changes:
Move Aidl utility code to aidl/utils -- hal 2/2
Move Aidl utility code to aidl/utils -- hal 1/2
2021-11-03 18:14:06 +00:00
Michael Butler
7f9d146254
Merge changes Ibd460229,I589668ef am: 7815893786 am: 00e983df29
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1877839
Change-Id: I33d2fe802c8c063f39b8bcaa630bdefcdd88129d
2021-11-02 21:12:07 +00:00
Michael Butler
00e983df29
Merge changes Ibd460229,I589668ef am: 7815893786
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1877839
Change-Id: Ia9887ecbd116066d9f9549986bf2c99730e30171
2021-11-02 20:55:35 +00:00
Michael Butler
7815893786
Merge changes Ibd460229,I589668ef
...
* changes:
Re-organize NNAPI Burst utility classes
Change NN adapter to use ExecutionBurstServer utility
2021-11-02 20:38:36 +00:00
Nathalie Le Clair
db777a32de
Merge "CEC: Add support for multiple ports to default HdmiCec" am: 63a8152f8e am: bfd12e9bf5
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1773889
Change-Id: I66714a05753aeea2f2fcc17c5605f387c6662947
2021-11-02 17:48:22 +00:00
Nathalie Le Clair
1296b84014
Merge "CEC: Add implementation of SYSTEM_CEC_CONTROL option to default HdmiCec" am: 3f3e91faa9 am: abb6a8067b
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1772433
Change-Id: Id140ea6b62689eb8cac5d5f3822aa6ea31b7ddf5
2021-11-02 17:48:14 +00:00
Nathalie Le Clair
9dcb8e29b4
Merge "CEC: Refactor HdmiCecDefault class" am: a2b3a8ffca am: 4e169ac218
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1833914
Change-Id: I2bcfdc24141142657b6e1a2694f6069797223239
2021-11-02 17:48:00 +00:00
Nathalie Le Clair
bfd12e9bf5
Merge "CEC: Add support for multiple ports to default HdmiCec" am: 63a8152f8e
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1773889
Change-Id: I1bc66418811ec675f538a60c4632d885234d3fe7
2021-11-02 17:28:03 +00:00
Nathalie Le Clair
abb6a8067b
Merge "CEC: Add implementation of SYSTEM_CEC_CONTROL option to default HdmiCec" am: 3f3e91faa9
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1772433
Change-Id: I64955334a2fc9af282a5252d0bbfe2baf1c600d0
2021-11-02 17:27:57 +00:00
Nathalie Le Clair
4e169ac218
Merge "CEC: Refactor HdmiCecDefault class" am: a2b3a8ffca
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1833914
Change-Id: I42968723a05601219bf62ba3310f0d2df7076284
2021-11-02 17:27:40 +00:00
Nathalie Le Clair
63a8152f8e
Merge "CEC: Add support for multiple ports to default HdmiCec"
2021-11-02 17:15:54 +00:00
Nathalie Le Clair
3f3e91faa9
Merge "CEC: Add implementation of SYSTEM_CEC_CONTROL option to default HdmiCec"
2021-11-02 17:15:24 +00:00
Nathalie Le Clair
a2b3a8ffca
Merge "CEC: Refactor HdmiCecDefault class"
2021-11-02 17:14:57 +00:00
Michael Butler
c331067aac
Move Aidl utility code to aidl/utils -- hal 2/2
...
This change is part of an effort to remove HAL types from
libneuralnetworks_common*. This change:
* Updates the header guard names for the new directory
* Removes the "Aidl" prefix from the files
* Adds temporary "Aidl" header files under include/ that redirect to
their corresponding files in include/nnapi/hal/aidl/
* Changes references of libneuralnetworks_common_hidl to
libneuralnetworks_common
Bug: 191442336
Test: mma
Change-Id: Icbcc04e0a49a9adf8d8826fd5735028ea26de0ca
2021-11-01 21:34:53 -07:00
Michael Butler
8fa5383407
Move Aidl utility code to aidl/utils -- hal 1/2
...
This change is part of an effort to remove HAL types from
libneuralnetworks_common*. This change moves the following files to
hardware/interfaces/neuralnetworks/aidl/utils:
* AidlBufferTracker.h
* AidlHalInterfaces.h
* AidlHalUtils.h
* AidlValidateHal.h
Bug: 191442336
Test: mma
Change-Id: I799d8ba761c004af963fc6bc044125d8828f2053
2021-11-01 21:34:49 -07:00
Michael Butler
137ee99a16
Re-organize NNAPI Burst utility classes
...
This change:
* Renames ExecutionBurstController to Burst in 1.2/utils
* Renames ExecutionBurstUtils to BurstUtils in 1.2/utils
* Renames ExecutionBurstServer to Burst in common/adapter
Bug: N/A
Test: mma
Change-Id: Ibd460229887c8c9cd23ebc6ee61da37c7c820288
2021-11-01 16:40:31 -07:00
Michael Butler
cfc16f94b2
Change NN adapter to use ExecutionBurstServer utility
...
Bug: 180492058
Bug: 177267324
Test: mma, presubmit
Change-Id: I589668efe187641a67934463bcdea8d19f095bb4
2021-11-01 14:48:48 -07:00
Michael Butler
8fc4890312
Merge "Revert^2 "Provide explicitly versioned NNAPI AIDL utils libs -- HAL."" am: be7f81f58d am: 1f711eed17
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1875575
Change-Id: I272fba248b0a023e91347be18230118a08014c27
2021-11-01 18:10:10 +00:00
Michael Butler
1f711eed17
Merge "Revert^2 "Provide explicitly versioned NNAPI AIDL utils libs -- HAL."" am: be7f81f58d
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1875575
Change-Id: I2c8492fcc69028f9efd7d9510d9c3b609180fe96
2021-11-01 17:53:50 +00:00
Michael Butler
be7f81f58d
Merge "Revert^2 "Provide explicitly versioned NNAPI AIDL utils libs -- HAL.""
2021-11-01 17:39:44 +00:00
Treehugger Robot
a2f7571af3
Merge "health AIDL: add vts tests" am: 9b965ac6a5 am: 0b1b6a0258
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1875176
Change-Id: Ie32c4ea09f628fdef1b2c4954b829a02b912eadb
2021-10-30 01:19:14 +00:00
Treehugger Robot
0b1b6a0258
Merge "health AIDL: add vts tests" am: 9b965ac6a5
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1875176
Change-Id: Ic5220a1e81cac4eae3a79b386bc5dbf5a3434b3a
2021-10-30 01:07:06 +00:00
Treehugger Robot
64c37c4ab2
Merge "health: make AIDL HAL recovery available." am: 919d9a3da3 am: 1d798d6b05
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1866341
Change-Id: I48a8df5e509f22d91fbd19b88d7312b2ec43abe1
2021-10-30 01:00:54 +00:00
Treehugger Robot
9b965ac6a5
Merge "health AIDL: add vts tests"
2021-10-30 00:53:03 +00:00
Treehugger Robot
1d798d6b05
Merge "health: make AIDL HAL recovery available." am: 919d9a3da3
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1866341
Change-Id: I48f17717766d577fd1032f501dfca20bc5e8bcd6
2021-10-30 00:43:04 +00:00
Treehugger Robot
919d9a3da3
Merge "health: make AIDL HAL recovery available."
2021-10-30 00:30:34 +00:00
Yifan Hong
2200cffdad
health AIDL: add vts tests
...
This is a direct translation of the health 2.0
and 2.1 VTS tests.
Some slight modifications are made (e.g. use googlemock
matchers) to make the test code more readable.
Test: run on Pixel
Bug: 203245778
Change-Id: Ifc3799a04a6a09d0d53f400b60d19fbfe004a3e3
2021-10-29 15:51:42 -07:00
Michael Butler
abc86918ae
Revert^2 "Provide explicitly versioned NNAPI AIDL utils libs -- HAL."
...
Reason for revert: rollforward fix of this topic
This change is a revert of I3d3ac4745, which itself is a revert of
I74f1798e8.
This CL modifies the AIDL utils libraries to be explicitly
versioned. Currently, we only have two versions: v1 and "current".
Specifically, the following changes are made:
- Remove AIDL dependencies from neuralnetworks_utils_hal_common
- Create explicitly versioned libs of neuralnetworks_utils_hal_aidl*
This is needed because it is not allowed for a build target to
link against multiple versions of the same AIDL lirary.
The canonical driver will report ANDROID_S for AIDL v1, and FL6 for v2.
Reverted Changes:
I2aefa0023:Revert "Use explicitly versioned NNAPI HAL util li...
Ia7df07ab9:Revert "Add neuralnetworks_utils_hal_aidl_v2 to al...
Iadd823460:Revert "Provide explicitly version NNAPI AIDL util...
I3d3ac4745:Revert "Provide explicitly versioned NNAPI AIDL ut...
Bug: 202405342
Test: NNT_static
Test: CtsNNAPITestCases
Test: VtsHalNeuralnetworksTargetTest
Change-Id: Ib3b732aa406f6d37e8f941082807c9232720c909
Merged-In: Ib3b732aa406f6d37e8f941082807c9232720c909
(cherry picked from commit 478a78ea77 )
2021-10-29 14:28:45 -07:00
Yifan Hong
2faf3adc25
Merge "health impl: compare interfaces with their binders" am: 1f5c57c965 am: e1bc376ed4
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1875175
Change-Id: Ia245dfb5e5a8511b3a2b98b08745225b03b63044
2021-10-29 21:26:06 +00:00
Treehugger Robot
75f1728617
Merge changes from topic "bluetooth_audio_hidl2.2" am: e1dc0e5365 am: 96f10677b9
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1872877
Change-Id: I090a3dde6ec5cb15db575602a5659b4732c2b53b
2021-10-29 21:25:58 +00:00
Treehugger Robot
ff5abf0302
Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/interfaces" am: 4cb51afac9 am: 77000a1e72
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1874549
Change-Id: Ic866f9b52b847d67befba3b02e7c6593e083d500
2021-10-29 21:25:49 +00:00
Yifan Hong
e1bc376ed4
Merge "health impl: compare interfaces with their binders" am: 1f5c57c965
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1875175
Change-Id: I9e926639f105fac49cee127b60f8c24d8ede2354
2021-10-29 21:18:58 +00:00
Yifan Hong
1f5c57c965
Merge "health impl: compare interfaces with their binders"
2021-10-29 21:16:46 +00:00
Yifan Hong
6839f6742e
health impl: compare interfaces with their binders
...
The intention is to compare binder objects not the
outer interface class.
Test: VTS
Bug: 177269435
Change-Id: I1c48112a75cb229b40c42ed2a3f347472d1860f9
2021-10-29 21:16:34 +00:00
Treehugger Robot
96f10677b9
Merge changes from topic "bluetooth_audio_hidl2.2" am: e1dc0e5365
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1872877
Change-Id: I21df41fdd4f0ace606317f9f473592b7fb6fe71c
2021-10-29 21:07:16 +00:00
Treehugger Robot
77000a1e72
Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/interfaces" am: 4cb51afac9
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1874549
Change-Id: I113ff29d2163d3e0caa101c35ba2d9e79d269cd1
2021-10-29 21:06:59 +00:00
Treehugger Robot
e1dc0e5365
Merge changes from topic "bluetooth_audio_hidl2.2"
...
* changes:
Add bluetooth.audio@2.2 implementation
Add hidl 2.2 for LE audio support
2021-10-29 21:00:22 +00:00
Treehugger Robot
4cb51afac9
Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/interfaces"
2021-10-29 20:41:35 +00:00
Shuzhen Wang
e3f1252677
Camera: Adjust VTS test to relax multi-camera requirement am: 55190e272d am: 69f3f612fa
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1874017
Change-Id: Ia16a194d087eb5ecf43b0711a065db2579487808
2021-10-29 20:18:55 +00:00
Shuzhen Wang
69f3f612fa
Camera: Adjust VTS test to relax multi-camera requirement am: 55190e272d
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1874017
Change-Id: I97e1584e5f3758af0483c0bb4a62cef8bfd39f71
2021-10-29 20:00:39 +00:00
Shuzhen Wang
55190e272d
Camera: Adjust VTS test to relax multi-camera requirement
...
The multi-camera Grf requirement is now only applicable to rear facing
camera.
Test: Run test on Pixel devices
Bug: 204252005
Change-Id: Idb7735eebdc104f6ee6a5946b50c11aea809eb85
2021-10-29 18:21:36 +00:00
David Drysdale
460d22a4da
Merge "KeyMint VTS: check INCLUDE_UNIQUE_ID works" am: 1e3d97de43 am: 010a23aa0d
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1853960
Change-Id: I5e455def037ffedde1b8b5e82eef558798de4146
2021-10-29 14:25:13 +00:00
David Drysdale
010a23aa0d
Merge "KeyMint VTS: check INCLUDE_UNIQUE_ID works" am: 1e3d97de43
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1853960
Change-Id: I826409f8df39f3228af231df16a84d780c2fada8
2021-10-29 14:06:49 +00:00
David Drysdale
1e3d97de43
Merge "KeyMint VTS: check INCLUDE_UNIQUE_ID works"
2021-10-29 13:49:07 +00:00
David Drysdale
565ccc70ed
KeyMint VTS: check INCLUDE_UNIQUE_ID works
...
Bug: 202487002
Test: atest VtsAidlKeyMintTargetTest (on CF, O6)
Change-Id: I8bc674b47549aa1133f816c510289774db752e04
2021-10-29 14:39:12 +01:00
David Drysdale
b7633b628a
Merge "Specify KeyMint EC keys by curve not size" am: 153bbc9cc5 am: 0e3027ab80
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1857515
Change-Id: If9c33f5574bfd7b02a035c83eac6359b9339a9c2
2021-10-29 06:24:55 +00:00