Commit graph

12082 commits

Author SHA1 Message Date
Amit Mahajan
a567b336fb Merge "Add Emergency Uniform Resource Name (URN)"
am: bd400ae327

Change-Id: I1ba8fcaca842c405f9851ad26d0cbaf117d5acf7
2019-01-28 19:37:33 -08:00
Yifan Hong
f84ae41b1e Merge "Build DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE."
am: 40877b8c21

Change-Id: I1e0a6937828b6b3ac3468edebfe793d2f21855ae
2019-01-28 19:35:40 -08:00
Xusong Wang
6693e7628c Test dynamic output shape in GeneratedTests.
am: d22c5232f3

Change-Id: Ia9b6a77feeff6fc17ee98405aa660b20eeb2fff7
2019-01-28 19:29:43 -08:00
David Gross
c8f068d3e9 Update neuralnetworks HAL to allow collecting execution duration.
am: 55a3d328b7

Change-Id: I78021985e5b5925496ccde21a600133a55351dce
2019-01-28 19:29:32 -08:00
Xusong Wang
172f95dda5 Clean and reorder operation enums.
am: 5d67a0bf05

Change-Id: I5b4a914edc48b05a9ccb22953873548fcc57147e
2019-01-28 19:29:20 -08:00
Lev Proleev
0a412cd884 mutateOperationOperandTypeSkip for new TRANSPOSE_CONV_2D variant
am: 2d98264026

Change-Id: I0d654e803f3a3aa2ddaedfd9dbddf30601d60b31
2019-01-28 19:29:09 -08:00
Xusong Wang
e612d90936 Add 1.2 NN HAL interface for dynamic output shape.
am: b50bc313d7

Change-Id: Ic16ede68ac3783b37f6b25a9e39863c12ccfc3f8
2019-01-28 19:28:57 -08:00
Xusong Wang
fc11d92cc4 Modify operation enum.
am: 1cc4ee8516

Change-Id: I4953692def15997d404767e876ac81fccf1a488c
2019-01-28 19:28:46 -08:00
Miao Wang
f8f124db0b Update NNAPI VTS test makefile after adding AHardwareBuffer support
am: e586a23815

Change-Id: Ic5900184458d58ee79d881e134d99d3063339fe6
2019-01-28 19:28:34 -08:00
Michael Butler
c59a80e394 NNAPI Burst -- HAL interface
am: a06e261af9

Change-Id: Idae73375f83c2e75b25ebc45f9c55fbb7ee25a96
2019-01-28 19:28:23 -08:00
Lev Proleev
c18270c17a mutateOperationOperandTypeSkip for new GROUPED_CONV_2D variant
am: b35eb1eabc

Change-Id: Iae21fa502bedf781994b78d14a64387eb7531963
2019-01-28 19:28:12 -08:00
Miao Wang
42b78d150b Add HAL entry to allow querying the device type
am: 7176fe7a63

Change-Id: I12c91a193c16f98d9093057b6c22026dde971ee5
2019-01-28 16:06:26 -08:00
Amit Mahajan
bd400ae327 Merge "Add Emergency Uniform Resource Name (URN)" 2019-01-28 18:50:55 +00:00
Yifan Hong
40877b8c21 Merge "Build DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE." 2019-01-28 18:08:44 +00:00
Yifan Hong
fee037aac8 Build DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE.
DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE is installed on
/product/etc/vintf. It is considered as a replacement of
DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE, so only one
of them may be defined. At build time, things like
SEPolicy versions etc. will be written to
/product/etc/vintf/compatibility_matrix.device.xml, just
like the /system one.

Also, split framework_compatibitity_matrix.xml to
system_compatibility_matrix.xml and product_compatibility_matrix.xml.
The latter two corresponds to matrices installed to respective
partitions only.

Test: build with DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE defined
Test: boot (sanity)
Bug: 120600021
Change-Id: I81f9a8f5028cbb88c45f44df04bccb8ccb483972
2019-01-25 13:58:34 -08:00
Xusong Wang
d22c5232f3 Test dynamic output shape in GeneratedTests.
Enable VTS unit test for dynamic output shape deduction.

Only test dynamic output shape for V1_2::IDevice with V1_2::Model.

Bug: 73506513
Test: VtsHalNeuralnetworksV1_xTargetTest with 1.2 sample driver
Change-Id: I4134e1ec54a15554eb8533134897279651b57da3
Merged-In: I4134e1ec54a15554eb8533134897279651b57da3
(cherry picked from commit a316581b21)
2019-01-24 19:11:36 -08:00
David Gross
55a3d328b7 Update neuralnetworks HAL to allow collecting execution duration.
Test: VtsHalNeuralnetworksV1_0TargetTest --hal_service_instance=android.hardware.neuralnetworks@1.0::IDevice/sample-all
Test: VtsHalNeuralnetworksV1_1TargetTest --hal_service_instance=android.hardware.neuralnetworks@1.1::IDevice/sample-all
Test: VtsHalNeuralnetworksV1_2TargetTest --hal_service_instance=android.hardware.neuralnetworks@1.2::IDevice/sample-all

Bug: 115390094

Change-Id: If67a5ffe39cfdd78498e01f26251734fdc8e66c7
Merged-In: If67a5ffe39cfdd78498e01f26251734fdc8e66c7
(cherry picked from commit e301349b05)
2019-01-24 16:07:03 -08:00
Xusong Wang
5d67a0bf05 Clean and reorder operation enums.
Four operation enums are removed:
- DETECTION_OUTPUT
- PRIOR_BOX
- SPARSE_TO_DENSE
- EMBEDDING_LOOKUP_SPARSE

Operation enums are reorder into alphabetic order.

Bug: 123253865
Bug: 122744669
Test: NeuralNetworksTest_static
Change-Id: Ie5d2bff6fac061bdca0a99e5b8c8ac05733fac4b
Merged-In: Ie5d2bff6fac061bdca0a99e5b8c8ac05733fac4b
(cherry picked from commit 28a33a9cb1)
2019-01-24 16:05:33 -08:00
Lev Proleev
2d98264026 mutateOperationOperandTypeSkip for new TRANSPOSE_CONV_2D variant
Bug: 119255406
Test: Vts NNAPI tests.
Change-Id: I63f7fc67cedcc2a9db8c359ff96be3c9403b9a20
Merged-In: I63f7fc67cedcc2a9db8c359ff96be3c9403b9a20
(cherry picked from commit 1509a2664c)
2019-01-24 16:05:08 -08:00
Xusong Wang
b50bc313d7 Add 1.2 NN HAL interface for dynamic output shape.
Let notify_1_2() notify output shapes.

Document unspecified dimensions and rank.

Bug: 73506513
Bug: 77234888
Test: NeuralNetworksTest_static
Test: VtsHalNeuralnetworksV1_xTargetTest with 1.2 sample driver
Change-Id: I01108913212d9f4aa47daf2f293ea19259925865
Merged-In: I01108913212d9f4aa47daf2f293ea19259925865
(cherry picked from commit 187c59715c)
2019-01-24 14:19:00 -08:00
Xusong Wang
1cc4ee8516 Modify operation enum.
Remove ROTATED_BBOX_TRANSFORM since it is no longer needed.
Add DETECTION_POSTPROCESS for SSD NMS postprocessing op.

Bug: 120983926
Test: NeuralNetworksTest_static
Change-Id: Id6b1021c8707734499feddddf0aac24a3fff90f8
Merged-In: Id6b1021c8707734499feddddf0aac24a3fff90f8
(cherry picked from commit 1f59bc3b24)
2019-01-24 14:16:56 -08:00
Miao Wang
e586a23815 Update NNAPI VTS test makefile after adding AHardwareBuffer support
Test: mm
Test: VTS
Change-Id: Ib98c08ce5cbbcd46f66ade80af28569f9cb14449
Merged-In: Ib98c08ce5cbbcd46f66ade80af28569f9cb14449
(cherry picked from commit 276b55b900)
2019-01-24 14:04:39 -08:00
Michael Butler
a06e261af9 NNAPI Burst -- HAL interface
FastMessageQueue is a Treble-compliant data structure that enables fast
communication between two processes. The FMQ object itself is an atomic
circular buffer that is optionally synchronized with a futex. However,
FMQ has no notion of ownership or lifetime across processes, so it must
be paired with higher-level constructs to manage the lifetime and
ownership.

The NNAPI is introducing the notion of an "Execution Burst" object (or
more simply a "Burst" object), which is similar to an
ANeuralNetworksExecution, but is intended to be reused across multiple
executions and has lower IPC overheads. It achieves this low IPC
overhead by replacing HIDL HwBinder calls with FMQ messages.
Specifically, it replaces IPreparedModel::executeSynchronously's call
from the client into the service with fmq_sync<FmqRequestDatum> (an FMQ
channel used to pass a serialized Request object) and it replaces
the return from the service into the client with
fmq_sync<FmqResultDatum> (an FMQ channel used to return serialized
result status and OutputShapes information).

Each channel is a unidirectional flow of information with exactly one
producer and exactly one consumer. The channels are created by the NN
runtime and passed to the service via
IPreparedModel::configureExecutionBurst.

This CL defines the FmqRequestDatum and FmqResultDatum types in
types.hal. IBurstContext.hal defines IBurstContext, a HIDL object used
by the service to manage the resources of a Burst. IBurstCallback.hal
defines IBurstCallback, a HIDL callback object that can be used to
retrieve the handle to a resource the service has either not yet seen or
has evicted from its cache. Finally, IPreparedModel.hal is extended with
IPreparedModel::configureExecutionBurst to create the burst object.

Bug: 119570067
Test: mma
Change-Id: I333da70201531b1396efc714d096c277e8e1d47b
Merged-In: I333da70201531b1396efc714d096c277e8e1d47b
(cherry picked from commit 7e91e24fe1)
2019-01-24 14:04:35 -08:00
Lev Proleev
b35eb1eabc mutateOperationOperandTypeSkip for new GROUPED_CONV_2D variant
Bug: 119255406
Test: Vts NNAPI tests.
Change-Id: I234727f5abba546c1392f7096b7d411d36566bbf
Merged-In: I234727f5abba546c1392f7096b7d411d36566bbf
(cherry picked from commit b0762ccb2f)
2019-01-24 14:04:01 -08:00
Miao Wang
7176fe7a63 Add HAL entry to allow querying the device type
Bug: 111425781
Bug: 112661050
Test: mm
Test: NeuralNetworksTest_static
Change-Id: Iced35c24eb2905c10fbf86d55319fdb5c7488703
Merged-In: Iced35c24eb2905c10fbf86d55319fdb5c7488703
(cherry picked from commit e3b93534c0)
2019-01-24 14:03:59 -08:00
Ajay Panicker
79f0e34c83 Merge "Add getCodecCapabilities as a supported function."
am: 7c2fd0b19a

Change-Id: I624ff9e0ffd19fe9212eb43a65e804a042762763
2019-01-24 13:50:46 -08:00
Ajay Panicker
7c2fd0b19a Merge "Add getCodecCapabilities as a supported function." 2019-01-24 21:32:24 +00:00
Peter Kalauskas
e72f2918af Merge "Add lazy service target to the light HAL"
am: 9f66559fd7

Change-Id: Ib48f1b79a48b78d06954746a2b4b44a965822562
2019-01-24 07:26:53 -08:00
Peter Kalauskas
9f66559fd7 Merge "Add lazy service target to the light HAL" 2019-01-24 15:11:02 +00:00
Pierre Lee
1525fe838b [automerger skipped] The test failed when one of the three cameras was configured with a maximum android.scaler.availableStreamConfiguration size of 1600*1200 am: 6f6fe9a5e2 -s ours
am: 085c990b30 -s ours
am skip reason: change_id Ia4845d43871730e14b5ba1411ce72f8c4bb69042 with SHA1 f234e45b20 is in history

Change-Id: I2f003a237ace585cf4adfb4c872752583a2aa780
2019-01-23 21:47:42 -08:00
Pierre Lee
085c990b30 [automerger skipped] The test failed when one of the three cameras was configured with a maximum android.scaler.availableStreamConfiguration size of 1600*1200
am: 6f6fe9a5e2 -s ours
am skip reason: change_id Ia4845d43871730e14b5ba1411ce72f8c4bb69042 with SHA1 f234e45b20 is in history

Change-Id: I0f59c7c14f2470b923ff4c6740ff93da23338841
2019-01-23 21:37:12 -08:00
sqian
99004cd57e Add Emergency Uniform Resource Name (URN)
Test: Treehugger
Bug: 112657134
Change-Id: I6c965d6b4a55e9370de3a9eeef5402468ae9c44b
Merged-In: I6c965d6b4a55e9370de3a9eeef5402468ae9c44b
(cherry picked from commit 2a45c732e3)
2019-01-23 17:18:54 -08:00
Ajay Panicker
5f0e90ece7 Add getCodecCapabilities as a supported function.
Add the ability to get a list of supported codecs and their capabilites
through the HIDL interface.

Bug: 111519504
Test: Compile
Change-Id: I61dff240a98d59cb99b526d8988d0d0245140ee4
2019-01-23 15:33:59 -08:00
Peter Kalauskas
45c1dd8160 Add lazy service target to the light HAL
This change allows a device to include the lazy service implementation,
which will allow the HAL to exit when it is not in use.

Test: Manually observe brightness slider behavior
Change-Id: I7f8f747ebe6e183e1aaf1406852e6e26a97aee35
2019-01-23 15:29:05 -08:00
Paul Hu
291c63b21b Merge "Refine error causes to make them more clear"
am: db4cc673f5

Change-Id: I9f0778aeb1f306cb28f228383e0b8033f9af2405
2019-01-22 17:57:52 -08:00
Paul Hu
db4cc673f5 Merge "Refine error causes to make them more clear" 2019-01-23 01:25:02 +00:00
Socrates Li
802422d05e Camera: Document 3.4 metadata selection logic.
am: 9ada649246

Change-Id: I1b3a4509983fbbcc9c93f28d7c4aab5ece367c52
2019-01-22 16:47:15 -08:00
Nazanin Bakhshi
e816c587f0 Merge "Add getModemEnabled HAL API"
am: 5acbc036b0

Change-Id: I62b5453b62d8e68eebd09c784c82ed5b5d910caa
2019-01-22 13:47:23 -08:00
Socrates Li
9ada649246 Camera: Document 3.4 metadata selection logic.
Bug: 119575429
Test: Ensure everything still builds.
Change-Id: I6500ab06b8c392310009ecfa0570000742fd069c
Merged-In: I6500ab06b8c392310009ecfa0570000742fd069c
(cherry picked from commit a5cbabbee9)
2019-01-22 13:46:57 -08:00
Treehugger Robot
5acbc036b0 Merge "Add getModemEnabled HAL API" 2019-01-22 21:29:24 +00:00
Nazanin Bakhshi
da4e793b56 Add getModemEnabled HAL API
Bug: 121020566
Test: vts
Change-Id: I1ac193dd144b840e4f3e3a397c0c93327ac00186
Merged-In: I1ac193dd144b840e4f3e3a397c0c93327ac00186
2019-01-22 20:51:33 +00:00
Youming Ye
2d80031567 Clean up error codes and add error description for IRadioResponse 1.4.
am: 7224c5dc1c

Change-Id: If38a344a841d0a81f5263d24338967af535e913e
2019-01-22 11:58:58 -08:00
Youming Ye
7224c5dc1c Clean up error codes and add error description for IRadioResponse 1.4.
Clean up some unneeded/confusing error codes in the 1.4 Radio HAL.
Quoting description from aosp/616923:

-Remove SYSTEM_ERROR. This is an ultra-generic error
 that also provides no meaningful distinction from
 INTERNAL_ERROR but is even less specified in scope.

-Remove NO_MEMORY. This is very implementation
 specific, and should be essentially impossible to
 hit in the generic sense. Today we don't have a
 generic EBUSY error code, which this would map to.
 Since it should be essentially impossible to hit,
 the preference is to assert that it shouldn't be.
 If an implementation really has memory pressure
 then it can return INTERNAL_ERROR, of which this
 is a class. INTERNAL_ERROR will be treated as a
 temporary failure anyway, making NO_MEMORY a
 distinction without a difference.

-Remove CANCELLED. We have no way to cancel an API
 call. If a persistent/ongoing request is cancelled
 by the caller using a separate API request, then
 that's a success case rather than an error case.

Bug: 73174777
Change-Id: I5bf268f86ed52e7294f7127f24beba04c9159fea
Test: Compilation
2019-01-22 17:49:40 +00:00
Pierre Lee
cb516f7cca Merge "The test failed when one of the three cameras was configured with a maximum android.scaler.availableStreamConfiguration size of 1600*1200"
am: ac6175ee79

Change-Id: I3e2b8d078abcd414663f802afa1d3d6926e08247
2019-01-21 20:21:33 -08:00
Pierre Lee
6f6fe9a5e2 The test failed when one of the three cameras was configured with a maximum android.scaler.availableStreamConfiguration size of 1600*1200
VTS gets the name of all the cameras in the machine and check each camera, When traversal to the configuration reference of 1600*1200 camera, the outputPreviewStreams variable does not clear, save the value of the Previous camera
The outputPreviewStreams variable needs to be cleared when check next camera

Bug: 122806546
Test: ConfigureStreamsWithSessionParameters can pass when one of the three cameras was configured with a maximum android.scaler.availableStreamConfiguration size of 1600*1200
Change-Id: Ia4845d43871730e14b5ba1411ce72f8c4bb69042
Merged-In: Ia4845d43871730e14b5ba1411ce72f8c4bb69042
2019-01-22 04:13:52 +00:00
Treehugger Robot
ac6175ee79 Merge "The test failed when one of the three cameras was configured with a maximum android.scaler.availableStreamConfiguration size of 1600*1200" 2019-01-22 04:12:43 +00:00
Tor Norbye
a63b2e4d4f Update signature files to the new format
am: 0074475ccf

Change-Id: I1ea62c1b2bcb450dc695dab74230560a48f09191
2019-01-20 07:25:52 -08:00
Tor Norbye
0074475ccf Update signature files to the new format
The new format is described in tools/metalava/FORMAT.md.

Fixes: 116589402 Switch signature files over to the v2 format
Fixes: 112626813 Drop "synchronized" modifier from the signature format
Fixes: 122358225 Omit overriding methods that only differ in final [...]
Fixes: 73088715 API Review: Need doclava to output nullability
Fixes: 79739773 API Review: Metalava enforcing constants are constant
Exempt-From-Owner-Approval: Large-scale tooling change
Test: make sdk, make update-api, make checkapi
Change-Id: I767f9fb2941789615c9513072a381e79a5654373
Merged-In: I2943d9a65c24e7ca8fb9ae9b69f7edf06173f467
2019-01-18 22:08:52 -08:00
paulhu
14e4d76502 Refine error causes to make them more clear
Many of error causes reason are using very esoteric
abbreviations and acronyms. Refine description for making more
clear to the developer.

Bug: 113505704
Test: Build pass and data call can setup normally.
Change-Id: Ifb9c256eef8354add46c76c322cd6a3bd126bd44
2019-01-19 03:17:35 +00:00
Michele Berionne
578fc681b2 Merge "Carrier restriction enhancements for Android Q"
am: f6dbeefbc3

Change-Id: I48aa943c11e036e25a26c5698822bd729f1686b0
2019-01-18 16:34:16 -08:00