Commit graph

598 commits

Author SHA1 Message Date
Automerger Merge Worker
74f96cef00 Merge "IDumpstateDevice@1.1 polish" am: d05efa2c1f
Change-Id: Ib2fb4c0749f96fcfea01ab957f5da1bded3dd852
2020-02-10 20:53:37 +00:00
Treehugger Robot
d05efa2c1f Merge "IDumpstateDevice@1.1 polish" 2020-02-10 20:38:39 +00:00
Automerger Merge Worker
7c55cbca56 Merge "NNAPI HAL: Remove priority from prepareModelFromCache_1_3" am: ea14e3445e
Change-Id: Ia57863300b38b9e64f0db92ced5b04498c9d9c40
2020-02-08 00:59:56 +00:00
Hunter Knepshield
256f77a588 IDumpstateDevice@1.1 polish
- Return a DumpstateStatus from dumpstateBoard_1_1
- Better toggle API surface: set/getDeviceLoggingEnabled
- Improved testing to allow for unsupported DumpstateMode values

Bug: 143183758
Bug: 143184495
Test: atest VtsHalDumpstateV1_1TargetTest
Merged-In: I505c2a790dc28ddce9b6f5b674394ef65b31c80c
(cherry picked from commit 6e278a3798)

Change-Id: Ibbd15f65674cfa6b9f5c1d6a633277a419499d9f
2020-02-06 18:23:38 -08:00
Michael Butler
68a868b2ac NNAPI HAL: Remove priority from prepareModelFromCache_1_3
prepareModelFromCache_1_3 uses model cache and data cache that
represent a prepared model. Any argument that contributes in a
meaningful way to the prepared model is implicitly included in
this model cache and data cache. For example, "model" and
"executionPreference" appear in prepareModel_1_3 but not in
prepareModelFromCache_1_3 because they are implicitly included
in the model cache and data cache. In a similar way, because
it could affect the resulting model, "priority" should be
removed from prepareModelFromCache_1_3.

Fixes: 148802784
Test: mma
Test: VtsHalNeuralnetworksV1_3TargetTest
Change-Id: I518e493ead8aa97220b16370cce8523b425c378c
Merged-In: I518e493ead8aa97220b16370cce8523b425c378c
(cherry picked from commit c90250ff57)
2020-02-06 11:38:08 +00:00
Automerger Merge Worker
396315d92f Merge "Identity Credential: Require passing applicationId when generating attestation." am: 7175150e3f
Change-Id: I797946e69bc98ab490976bfd56c3b19e098a6f2d
2020-02-04 21:49:42 +00:00
Treehugger Robot
7175150e3f Merge "Identity Credential: Require passing applicationId when generating attestation." 2020-02-04 21:31:31 +00:00
Automerger Merge Worker
32a891a587 Merge "Cleanup IRadio/IRadioConfig HAL" am: f107b4231e
Change-Id: I32a16adca84cd734705a4646a9f16ee5e9bccf64
2020-02-04 17:50:22 +00:00
Treehugger Robot
f107b4231e Merge "Cleanup IRadio/IRadioConfig HAL" 2020-02-04 17:42:39 +00:00
Automerger Merge Worker
f48c750c10 Merge "Update sync fence related API for NNAPI" am: 1eb640d440
Change-Id: I83808f988b7e27d405b66c63feae311ed175e46b
2020-02-04 00:33:30 +00:00
Xusong Wang
1eb640d440 Merge "Update sync fence related API for NNAPI" 2020-02-04 00:19:25 +00:00
Sarah Chin
f90eddff52 Cleanup IRadio/IRadioConfig HAL
Removed unused import statements.
Consistent between internal and AOSP.
More accurate names for ModemFeatures.

Test: make
Change-Id: Icbfe35d472ab3f7fd6cd50b4888e3c478dd29fd2
Merged-In: Icbfe35d472ab3f7fd6cd50b4888e3c478dd29fd2
2020-02-03 20:33:33 +00:00
David Zeuthen
87cb07bd08 Identity Credential: Require passing applicationId when generating attestation.
Since the attestation format includes the applicationId, we need this
to be passed from credstore. Also clarify other requirements about
what needs to be in the attestation data.

Bug: 111446262
Test: atest android.security.identity.cts
Test: VtsHalIdentityCredentialTargetTest
Test: android.hardware.identity-support-lib-test
Change-Id: I623849bd61e55752a573002dc7a97c6658d94c91
2020-01-31 17:42:07 -05:00
Automerger Merge Worker
e067d70f96 Merge "Make IDumpstateDevice 1.1" am: 99ad09b7e7
Change-Id: I4e2eb97b0341352acf9ae2f63a2da508f63d3c0c
2020-01-31 16:40:28 +00:00
Automerger Merge Worker
cf043b51fa Support sync fence in NNAPI am: 12ea0d4ed6
Change-Id: Iedb6f8e127ca8df0c2e7322ba5b0e97f8e6ecac0
2020-01-31 16:23:04 +00:00
Automerger Merge Worker
14dca9ee25 Add FILL and RANK ops am: 53a51cb352
Change-Id: If390c156fb2aa1666bfff31fc94dc75b6e6cce7b
2020-01-31 16:23:02 +00:00
Automerger Merge Worker
b17645bc30 Add ELU and HARD_SWISH am: 503d850369
Change-Id: I2347a7439107a05429f7e1488c9b4ce5d57f34b7
2020-01-31 16:23:00 +00:00
Automerger Merge Worker
4743cd38bc NNAPI: Regenerate types.hal to sync with types.spec am: e4f1583337
Change-Id: I342797ade096e9ca5ed67a37527ccff70edc5ef7
2020-01-31 16:22:56 +00:00
Automerger Merge Worker
f0200c74b7 Merge "Manual network selection by RAN type" am: b25740f083
Change-Id: I635ef788b7c5e696ac95935306cecac407a2c047
2020-01-31 16:08:39 +00:00
Treehugger Robot
99ad09b7e7 Merge "Make IDumpstateDevice 1.1" 2020-01-31 01:06:20 +00:00
Miao Wang
99753d9e90 Update sync fence related API for NNAPI
- Allow IPreparedModel::executeFenced to measure gated durations.
 - Allow IPreparedModel::executeFenced to specify an optional deadline
 and aa optional post-gate-release maximum duration.

Bug: 142778241
Bug: 141363565
Test: mm
Change-Id: I1687ec5543f93ed9bb5d7fcf14dbe15ed5b5cd0d
Merged-In: I1687ec5543f93ed9bb5d7fcf14dbe15ed5b5cd0d
(cherry picked from commit 3fd70b020e)
2020-01-30 15:23:23 -08:00
Xusong Wang
1b4b30d064 Merge changes from topics "aosp-nnapi-1.3-operations", "aosp-nnapi-async-cmdqueue"
* changes:
  Fix the NNAPI vts tests about validateExecuteFenced
  Add VTS tests for NNAPI IPreparedModel::executeFenced
  Support sync fence in NNAPI
  Add FILL and RANK ops
  Add ELU and HARD_SWISH
  NNAPI: Regenerate types.hal to sync with types.spec
2020-01-30 23:18:32 +00:00
Automerger Merge Worker
4fb96b26ae Add Quality of Service to NNAPI HAL am: ed8e77bf12
Change-Id: Ic3e66248fb49a42c97408476dff88df88d40548c
2020-01-30 17:51:18 +00:00
Sarah Chin
b25740f083 Merge "Manual network selection by RAN type" 2020-01-29 21:36:31 +00:00
Xusong Wang
27cfaa82f8 Merge changes from topic "aosp-nnapi-qos"
* changes:
  Create VTS tests for QoS in NNAPI
  Update NNAPI 1.3 VTS tests with new types
  Add Quality of Service to NNAPI HAL
2020-01-29 19:14:56 +00:00
Sarah Chin
0b0871ee6b Manual network selection by RAN type
Support updated API for setNetworkSelectionModeManual

Bug: 68116277
Test: atest FrameworksTelephonyTests
Change-Id: I7076da1734d2d020adef568188cb4f4b4914f379
Merged-In: I7076da1734d2d020adef568188cb4f4b4914f379
2020-01-29 10:04:07 -08:00
Sarah Chin
a4021bde11 Merge changes from topics "multiband", "ssc3"
am: 39ddbb92a5

Change-Id: I823e0109eefff2541fe03987eadb293ba08b958c
2020-01-29 08:58:15 -08:00
Jack Yu
10a7dfb190 Added multi-band support
am: 295d9d42c4

Change-Id: I042a1f57a27146046d07653bd5d7fa80e3614fe4
2020-01-29 08:57:44 -08:00
Sarah Chin
39ddbb92a5 Merge changes from topics "multiband", "ssc3"
* changes:
  Fixed the comment and time name
  Added multi-band support
2020-01-29 16:45:15 +00:00
Sarah Chin
6e3048d2f7 Merge changes from topics "caps_refactor", "multi-plmn", "nr_band", "v6mtu"
am: d8c60800ae

Change-Id: I7ac6128e347cd9e1ecf74ca9b60e6352d3876ca3
2020-01-29 08:14:16 -08:00
Sarah Chin
e5a98c9394 Support IPv6 MTU in IRadio 1.5
am: 308569a879

Change-Id: Iff71685525c5ff1add79507d614ff7235a61c885
2020-01-29 08:13:44 -08:00
Jack Yu
55c9e7f144 Added NR band support
am: e7dcbfc135

Change-Id: Id31d8706c2edbbc8f66857fecf438235773cf562
2020-01-29 08:13:05 -08:00
Nathan Harold
21191f558c Add Multi-PLMN and CSG support
am: 8f0d8b1840

Change-Id: Id9f768fc853756faeec831e2938dc5a7cada5059
2020-01-29 08:12:12 -08:00
Sarah Chin
d8c60800ae Merge changes from topics "caps_refactor", "multi-plmn", "nr_band", "v6mtu"
* changes:
  Update PhoneCapability to use 1.5 UTRAN bands
  Support IPv6 MTU in IRadio 1.5
  Added NR band support
  Add Multi-PLMN and CSG support
2020-01-29 15:56:09 +00:00
Automerger Merge Worker
f02d380818 Merge changes from topic "aosp-nnapi-cf" am: 8d38d27bb9
Change-Id: I5afe108e5248b2012ddb4c8a36e66aaf8c792864
2020-01-28 22:38:23 +00:00
Automerger Merge Worker
3c4e9c2aea Remove neuralnetworks@1.3::Model.Extension* in favor of 1.2 counterparts am: 351ca59582
Change-Id: I2079e0ec0e0ad8de8e6be8e5ea5436c3eded97ce
2020-01-28 22:38:19 +00:00
Treehugger Robot
8d38d27bb9 Merge changes from topic "aosp-nnapi-cf"
* changes:
  Add NNAPI control flow
  Remove neuralnetworks@1.3::Model.Extension* in favor of 1.2 counterparts
2020-01-28 22:17:36 +00:00
Xusong Wang
af9a9cb5b8 Memory Domain HAL: Define HAL APIs.
am: b345a4688f

Change-Id: I91873d666054ebe8625166eec67891bd256eda12
2020-01-28 10:30:03 -08:00
Xusong Wang
5f675cfdd7 Merge changes from topic "aosp-nnapi-memory-domain"
* changes:
  Add memory domain VTS generated tests.
  Memory Domain HAL: Define HAL APIs.
2020-01-28 18:24:34 +00:00
Sarah Chin
beded753de Merge changes from topics "phone_cap", "tdscdma", "update-regstate-rplmn"
am: 868156ace2

Change-Id: Iad296d2f1c0256a191932e00ac7a3bd79f8562fa
2020-01-28 09:37:39 -08:00
Sarah Chin
3b5db56bd4 PhoneCapabilities changes for device capabilities
am: e1d1b0b92c

Change-Id: I0213af18d48ae891a35b903662b84e8755a84b27
2020-01-28 09:37:04 -08:00
Jack Yu
40658fb223 Added TD-SCDMA bands for network scanning
am: 5b971bfa50

Change-Id: I80f8bef793f834406ec7c7223df004f9c5a450ab
2020-01-28 09:36:26 -08:00
Jack Yu
478603456f Fixed the comment and time name
To match the API in LinkAddress.

Test: Telephony sanity tests
Bug: 135717900
Change-Id: I06559044c8015bc577d9e4ca489a4924f69093b2
Merged-In: I06559044c8015bc577d9e4ca489a4924f69093b2
2020-01-27 18:05:11 -08:00
Jack Yu
295d9d42c4 Added multi-band support
One cell could have multiple bands assigned.
One frequency could be shared by multiple bands
because they have overlapping.

Test: Telephony sanity tests.
Bug: 131061889
Change-Id: I6018b9df8b8bd0745c3736df764f4569bea28baa
Merged-In: I6018b9df8b8bd0745c3736df764f4569bea28baa
2020-01-27 17:52:48 -08:00
Sarah Chin
f0cfc3ef60 Update PhoneCapability to use 1.5 UTRAN bands
Test: build
Bug: 143238191
Change-Id: Id86ad81d837c983e2d34633fdebdfc308e219a3d
Merged-In: Id86ad81d837c983e2d34633fdebdfc308e219a3d
2020-01-27 17:44:12 -08:00
Sarah Chin
308569a879 Support IPv6 MTU in IRadio 1.5
Change mtu->mtuV4 and add mtuV6 for DataProfileInfo and
SetupDataCallResult

Test: mm and build
Bug: 146668814
Change-Id: I33320281730fdb91d2b07d11cd24a95d0834c9dd
Merged-In: I33320281730fdb91d2b07d11cd24a95d0834c9dd
2020-01-27 15:36:15 -08:00
Jack Yu
e7dcbfc135 Added NR band support
Added band info in cell identity.

Test: Telephony sanity tests
Bug: 131061889
Change-Id: I5205aa70db0d83fd049c5f25b0b427ab7484727b
Merged-In: I5205aa70db0d83fd049c5f25b0b427ab7484727b
2020-01-27 15:28:06 -08:00
Miao Wang
12ea0d4ed6 Support sync fence in NNAPI
- Add IPreparedModel::dispatchRequest to NNAPI 1.3 HAL
  - Add IDispatchExecutionCallback to allow clients query information
  related to the actual evaluation.

Bug: 142778241
Test: mm
Change-Id: I87cbb7f2aee87342b0418fce04eb4050e2bc1920
Merged-In: I87cbb7f2aee87342b0418fce04eb4050e2bc1920
(cherry picked from commit 90cf3dd37c)
2020-01-27 12:58:31 -08:00
Lev Proleev
53a51cb352 Add FILL and RANK ops
Bug: 148050168
Bug: 148049333
Test: NNTest_static and VtsHalNeuralnetworksV1_3TargetTest
Change-Id: Iebdfa600d84e31532807740c21d95cae41c76ad5
Merged-In: Iebdfa600d84e31532807740c21d95cae41c76ad5
(cherry picked from commit 8b3f240ea3)
2020-01-27 12:58:14 -08:00
Lev Proleev
503d850369 Add ELU and HARD_SWISH
Bug: 147482068
Bug: 147481241
Test: NNTest_static and VtsHalNeuralnetworksV1_3TargetTest
Change-Id: Iab8da2a666ad9775dfb53d9297e94962fb651353
Merged-In: Iab8da2a666ad9775dfb53d9297e94962fb651353
(cherry picked from commit aee67f83f9)
2020-01-27 12:57:58 -08:00