Commit graph

29566 commits

Author SHA1 Message Date
Michael Butler
8f583928c7 Merge changes from topic "nnapi-timings"
* changes:
  Remove 'blocking' param from NN ResilientPreparedModel and *Buffer
  Cleanup NN callback error handling
  Add HIDL lifetime and protecting callback info to NN README
  Change NN canonical timings to nanoseconds -- hal
2020-12-29 21:38:13 +00:00
TreeHugger Robot
5562342428 Merge "Move utcTime in default implementation forward" 2020-12-29 02:32:19 +00:00
Yu-Han Yang
bcf3b22fba Move utcTime in default implementation forward
Bug: 175890761
Test: atest GnssLocationUpdateIntervalTest#testLocationUpdatesAtVariousIntervals
Change-Id: Iab572243fc8cbf2f34df0b45614050ad794af384
2020-12-28 13:34:22 -08:00
Treehugger Robot
5ef7bb5a1c Merge "Audio: Fix automatic version replacement in IStreamOutEventCallback.hal" am: 85959e1682 am: e86f94f7f6 am: ff8a37351f
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1533854

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id19c9d873bfa3230581b15ade8ac0ae7a4777eb7
2020-12-28 21:23:00 +00:00
Treehugger Robot
ff8a37351f Merge "Audio: Fix automatic version replacement in IStreamOutEventCallback.hal" am: 85959e1682 am: e86f94f7f6
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1533854

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I00e9f280a5dfba734a9f5bf77def60d7643b0e89
2020-12-28 21:07:52 +00:00
Shuo Qian
84b7069ab7 Add emergencyDial_1_6 in the HAL to modify the multisim logic for pin lock
Test: vts
Bug: 171235919
Change-Id: I94319ab345dabae040792b14b2f8bd8bc64839c0
2020-12-28 12:44:55 -08:00
Treehugger Robot
e86f94f7f6 Merge "Audio: Fix automatic version replacement in IStreamOutEventCallback.hal" am: 85959e1682
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1533854

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I203ecb79aa6c743ceb3f2c2134b76aa2b63925ac
2020-12-28 20:36:42 +00:00
Marin Shalamanov
2c05bb003a VTS: Test that configs in a group differ only by vsync period am: 6f36dd6e31 am: e834cea452 am: 7f31d5fda4
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1533539

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaf4d83b6fee875da9d5a15e334b0b691a676752d
2020-12-28 20:36:01 +00:00
Marin Shalamanov
7f31d5fda4 VTS: Test that configs in a group differ only by vsync period am: 6f36dd6e31 am: e834cea452
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1533539

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie0000674bc1b682648aae9e6febd789f3084742c
2020-12-28 20:15:42 +00:00
Treehugger Robot
85959e1682 Merge "Audio: Fix automatic version replacement in IStreamOutEventCallback.hal" 2020-12-28 20:08:24 +00:00
Marin Shalamanov
e834cea452 VTS: Test that configs in a group differ only by vsync period am: 6f36dd6e31
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1533539

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic573db3d62c67167c4c9e0ed7a695d8a4da9cf2b
2020-12-28 19:50:15 +00:00
Marin Shalamanov
6f36dd6e31 VTS: Test that configs in a group differ only by vsync period
All display configs in a config group must have the same resolution
and DPI (if DPI attributes are supported by HWC).

Fixes: 172902326
Test: atest VtsHalGraphicsComposerV2_4TargetTest
Change-Id: Id86fe7983a12e33d2d9c3b88ee68d6e18485e87d
2020-12-28 19:35:49 +00:00
TreeHugger Robot
8ffdb30eee Merge "Update documentation for secondary bandwidth" 2020-12-24 00:20:08 +00:00
Sooraj Sasindran
66dbcee2d3 Update documentation for secondary bandwidth
Update documentation for secondary bandwidth to indicate that
some modems do not support this feature

Test: build
Bug: 162373679
Change-Id: I03d4079e03817fe7c7b52eb18058c49e54302d6b
2020-12-23 22:52:48 +00:00
Treehugger Robot
219547973f Merge "Change KM attestation generation to managed cert type." am: c3c893a522 am: a3c74e8e71 am: 605805521b
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1527801

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iad182cd93ef96b3c54738e981d46f9b80143dc81
2020-12-23 21:06:16 +00:00
Treehugger Robot
605805521b Merge "Change KM attestation generation to managed cert type." am: c3c893a522 am: a3c74e8e71
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1527801

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I37c20d5b6baa07bf417149aa374afb0f1e0128b7
2020-12-23 20:12:34 +00:00
Jennifer Tsau
907f774486 Merge "Fixed flags on example. Guest is 2 and Ephemeral is 4, so it should be 6." 2020-12-23 20:01:42 +00:00
Jennifer Tsau
9d480d32a3 Fixed flags on example.
Guest is 2 and Ephemeral is 4, so it should be 6.

Bug: 157770534
Test: None
Change-Id: I82b94427a4474ee0773f17f5cda8338d5b7c3989
2020-12-23 20:00:39 +00:00
Treehugger Robot
a3c74e8e71 Merge "Change KM attestation generation to managed cert type." am: c3c893a522
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1527801

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6d5ef4c7c56cde622450a0cfed45569d7dad446e
2020-12-23 19:46:00 +00:00
Treehugger Robot
bdebbc7778 Merge "Fix atest VtsAidlKeyMintTargetTest" am: 0347422479 am: 0df8d23677 am: c9fe8f0a06
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1535588

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idca1b00205a5ba6b9df877635b625179efaa22f4
2020-12-23 19:44:44 +00:00
Treehugger Robot
c9fe8f0a06 Merge "Fix atest VtsAidlKeyMintTargetTest" am: 0347422479 am: 0df8d23677
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1535588

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id9cdb68055749f8e2af43f67361dc69103d721b7
2020-12-23 19:01:39 +00:00
Treehugger Robot
c3c893a522 Merge "Change KM attestation generation to managed cert type." 2020-12-23 18:55:39 +00:00
Treehugger Robot
0df8d23677 Merge "Fix atest VtsAidlKeyMintTargetTest" am: 0347422479
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1535588

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifa7578c2d581f64466b3b93435b7345bddf69120
2020-12-23 18:40:45 +00:00
Treehugger Robot
0347422479 Merge "Fix atest VtsAidlKeyMintTargetTest" 2020-12-23 18:25:47 +00:00
Shawn Willden
e0b0de5224 Fix atest VtsAidlKeyMintTargetTest
Renaming the test without updating the test configuration broke it.
This fixes it.

Test: atest VtsAidlKeyMintTargetTest
Change-Id: I3f4c07a04f2b0ce604f0bbac43ffdbdbb5b34d53
2020-12-23 09:30:59 -07:00
Midas Chien
ef75d0fba2 Merge "composer: vts: allocate buffer larger or equal to crop size" 2020-12-23 03:55:15 +00:00
Les Lee
3ee69a6186 Merge "wifi: Fix VTS error" 2020-12-23 03:30:21 +00:00
Kalesh Singh
efbb8ff2bf Reland: Memtrack HAL: Add stable AIDL implementation am: a851f3d711 am: ee88e0d273 am: e635b18109
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1533660

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I24b42f41dbc8f2052bf1f50ca522d3f30ec0e71f
2020-12-23 02:14:38 +00:00
Kalesh Singh
e635b18109 Reland: Memtrack HAL: Add stable AIDL implementation am: a851f3d711 am: ee88e0d273
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1533660

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2439960cf35ecfb2d4ea99633b331d43e937ff6d
2020-12-23 02:00:43 +00:00
Kalesh Singh
ee88e0d273 Reland: Memtrack HAL: Add stable AIDL implementation am: a851f3d711
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1533660

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3d4a31c15fda127912be6d8659a7c5d9f44822a1
2020-12-23 01:28:44 +00:00
Daniel Bright
7c07a5a96a Merge "Add S-NSSAI" 2020-12-23 00:52:26 +00:00
Mikhail Naganov
d7d258014e Audio: Fix automatic version replacement in IStreamOutEventCallback.hal
The version update script created a typo in the doc string
of IStreamOutEventCallback.

Test: N/A
Change-Id: I331a2781ecb212275d0f8acee33ff49d01714b53
2020-12-22 23:20:57 +00:00
Chirag Pathak
8b7455abb4 Add support and VTS test for RSA OAEP MGF1.
Test: atest VtsAidlKeyMintV1_0TargetTest
Bug: 160968519
Change-Id: I7093b26217b69ea36b4be8837b42cb9446887685
2020-12-22 15:58:52 -05:00
Kalesh Singh
a851f3d711 Reland: Memtrack HAL: Add stable AIDL implementation
Bug: 175021432
Test: adb shell dumpsys -l | grep android.hardware.memtrack.IMemtrack
Test: VtsHalMemtrackTargetTest
Change-Id: I686c0ecc31648dc6e58a6ab5e6ae914454111200
2020-12-22 20:49:35 +00:00
Shawn Willden
659f996a5d Change KM attestation generation to managed cert type.
Bug: 171846199
Test: atest VtsHalIdentityTargetTest
Change-Id: I03c55f74a21d24b3db8460b85816a4da5939c4ed
2020-12-22 15:11:01 +00:00
Eric Laurent
deebf381f6 audio HAL V7: Update track metadata
Add channel mask and audio attributes tags to playback
and record track metadata sent to audio HAL.

The legacy HAL wrapper supports older legacy HAL versions
by sending partial metadata when the legay HAL version is
less than 3.2.

Bug: 168751366
Test: make
Change-Id: Iba3ee3b669e4300201374d4a0d5cf45a04872274
2020-12-22 11:03:16 +01:00
lesl
143575a10c wifi: Fix VTS error
The current hostapd use channelParams1_3.bandMask
(changed on ag/13001575), but VTS doesn't
prepare test data:channelParams1_3.bandMask.

Test: atest VtsHalWifiHostapdV1_3TargetTest
Test: atest VtsHalWifiHostapdV1_2TargetTest
Test: atest VtsHalWifiHostapdV1_1TargetTest
Test: atest VtsHalWifiHostapdV1_0TargetTest
Bug: 176139512
Change-Id: Ibdc08acb55b673b464b5c59ae714157941487a5b
2020-12-22 15:19:58 +08:00
Treehugger Robot
be01f7e8d8 Merge "Revise keymint_tags.h" am: 2528ddcab2 am: 90ea1579e2 am: 14d0c8976d
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1533203

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9bc7876f6dd6393af9c6ddcf6ade0468e2dfbbcd
2020-12-22 07:03:33 +00:00
Treehugger Robot
00d76f0bfe Merge "Change KeyParameters to use a union." am: d389d1659a am: 268ef54b1a am: d6d80602eb
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1520082

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4334727b4f6132fd684eb1f1d840bde311421358
2020-12-22 07:01:45 +00:00
Michael Butler
bf59946c61 Remove 'blocking' param from NN ResilientPreparedModel and *Buffer
This change removes the 'blocking' parameter for the
ResilientPreparedModel::Factory and ResilientBuffer::Factory. The
'blocking' parameter is only useful for ResilientDevice::Factory, which
behind the scenes chooses between the HIDL calls IDevice::getService and
IDevice::tryGetService. The equivalent calls for IPreparedModel and
IBuffer are not used, as both are created from the IDevice object.

This change also modifies the ResilientDevice's device recovery
behavior. Prior to this change, ResilientDevice's recovery mechanism had
the following behavior:
* attempt to call a function
* if the function did not return a DEAD_OBJECT error, return
* if the function returned a DEAD_OBJECT error, attempt to recover the
  device
* whether or not the recovery succeeded, call the function again

This CL changes the behavior so that if device recovery fails,
ResilientDevice will not call the function the second time.

Bug: N/A
Test: mma
Change-Id: Icf37d05c884c740178324fcd046ea56914ef7d44
Merged-In: Icf37d05c884c740178324fcd046ea56914ef7d44
(cherry picked from commit 11761e37a8)
2020-12-21 21:09:56 -08:00
Michael Butler
7fd03c265e Cleanup NN callback error handling
This CL introduces a new templated class CallbackValue to handle HIDL
"return value" callbacks in a terser and more readable way.

This CL also introduces a new macro HANDLE_HAL_STATUS to return from the
current function when an error is present with the ability to append a
more descriptive error message.

Finally, this CL changes the behavior of synchronous executions. Prior
to this CL, IPreparedModel fell back to an asynchronous execution if the
synchronous execution was allowed and failed. This change instead
returns a failure if synchronous execution is allowed and fails.

Bug: 173084343
Test: mma
Change-Id: I62714a932e71dfc77401bbcb9eaaaf3d94fb9707
Merged-In: I62714a932e71dfc77401bbcb9eaaaf3d94fb9707
(cherry picked from commit 98ed9baf5d)
2020-12-21 21:09:37 -08:00
Michael Butler
aad934baa7 Add HIDL lifetime and protecting callback info to NN README
This CL copies information from
packages/modules/NeuralNetworks/runtime/VersionedInterfaces.cpp and
modifies the description to be more appropriate for the NN HAL utility
code.

Specific sections added to the README:
* "HIDL Interface Lifetimes across Processes"
* "Protecting Asynchronous Calls across HIDL"

Bug: 170289677
Test: mma
Change-Id: Id381895535d708b627f4746687b4d12e16560639
Merged-In: Id381895535d708b627f4746687b4d12e16560639
(cherry picked from commit 7a655bb3d4)
2020-12-21 21:09:14 -08:00
Michael Butler
4024d8f4d8 Change NN canonical timings to nanoseconds -- hal
A sibling CL to this CL changes the definition of nn::TimePoint to the
same type as std::chrono::steady_clock::time_point but has changed the
underlying duration representation to use uint64_t. That sibling CL also
renames nn::OptionalTimeoutDuration to nn::OptionalDuration, and changes
the definition to the same type as std::nanoseconds except the
underlying duration representation now uses uint64_t.

This CL makes changes to the NN HAL utility code in response to the
changes in the sibling CL.

Bug: 174297663
Test: mma
Test: NeuralNetworksTest_static
Change-Id: If44d9aefadb2c78b632ff289b5ff5a49f766525c
Merged-In: If44d9aefadb2c78b632ff289b5ff5a49f766525c
(cherry picked from commit ca11420785)
2020-12-21 21:08:43 -08:00
TreeHugger Robot
254b3632a9 Merge "Add voip optimization HAL API" 2020-12-22 01:29:34 +00:00
TreeHugger Robot
a7287af865 Merge "Implement MessageMutator and FamilyTracker" 2020-12-22 01:14:04 +00:00
Tomasz Wasilczyk
71412f40c6 Implement MessageMutator and FamilyTracker
Bug: 173729274
Test: Reboot TCU *after* HU and verify Wi-Fi STA gets SSID list
Change-Id: Ie7b0e264a73bd4597470fab8a9bcbfd03e82e9b3
2020-12-21 14:30:51 -08:00
Daniel Bright
85169ab87a Add S-NSSAI
* Added support for S-NSSAI within HAL
* Created struct SliceInfo that represents a S-NSSAI as defined
  in 3GPP TS 24.501.
* Added slice info to setupDataCall and SetupDataCallResult

Bug: 169960538
Test: made ims phone call
Change-Id: I8d2c55bece07c599cb7d1ac0d16ad85c0acdeae5
2020-12-21 14:03:28 -08:00
Michael Butler
1fd4b9d070 Merge "Remove 'blocking' param from NN ResilientPreparedModel and *Buffer" 2020-12-21 20:48:10 +00:00
Treehugger Robot
14d0c8976d Merge "Revise keymint_tags.h" am: 2528ddcab2 am: 90ea1579e2
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1533203

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I567a8c63bb6ef77fa3aba54b703736ab4d743bb4
2020-12-21 19:20:35 +00:00
Treehugger Robot
d6d80602eb Merge "Change KeyParameters to use a union." am: d389d1659a am: 268ef54b1a
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1520082

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I663d342ea0bd7ec66ad59e1366654909c2247d34
2020-12-21 19:18:15 +00:00