Commit graph

19426 commits

Author SHA1 Message Date
Lev Proleev
374719b0c9 Merge "Add ELU and HARD_SWISH" 2020-01-22 21:39:01 +00:00
Lev Proleev
393079e868 Merge "NNAPI: Regenerate types.hal to sync with types.spec" 2020-01-22 21:38:22 +00:00
Howard Yen
9ae790985a Merge changes from topic "usb_gadget_reset"
* changes:
  Add USB Gadget Hal v1.1 default implementation
  Add USB Gadget V1.1 with hash code
  USB Gadget V1.1 interface
2020-01-22 20:56:44 +00:00
Sarah Chin
5d372032d2 Merge changes from topics "nr_band", "nw_sel"
* changes:
  Manual network selection by RAN type
  Added NR band support
2020-01-22 20:03:32 +00:00
Automerger Merge Worker
15d56e7773 [automerger skipped] Merge changes from topic "engine_vts" am: 24a21c1b53 am: eb3c4cbe0b am: 04728790fa -s ours
am skip reason: Change-Id I62730caadafdcb5ebb3083d683625424864afe97 with SHA-1 94865666a7 is in history

Change-Id: I9c6d71570a1ae12dff33cc49738953b4559acab8
2020-01-22 18:58:15 +00:00
Automerger Merge Worker
738b787988 [automerger skipped] audio: Add VTS for configurable engine am: b449cdb228 am: 45e735733f am: c605a940b7 -s ours
am skip reason: Change-Id Ied37edc5bba29ef461f6b68fa21781d5721b75bf with SHA-1 5958d576ed is in history

Change-Id: I9c285c335fc202d6b4ae5d657d676f85d3635816
2020-01-22 18:58:13 +00:00
Automerger Merge Worker
ecf34ca723 [automerger skipped] audio: update XSD for dynamic engine loading support config am: f282171776 am: bd5f74b53e am: 1574fade9f -s ours
am skip reason: Change-Id Ic0afc27f09d8387236444901dfddc5f0f074ba1b with SHA-1 4060d8d7ae is in history

Change-Id: I47c17ed4b420a57f6c9c1f115e865a2c7ff6bd12
2020-01-22 18:58:10 +00:00
Automerger Merge Worker
04728790fa Merge changes from topic "engine_vts" am: 24a21c1b53 am: eb3c4cbe0b
Change-Id: I16334e414880f12721d04abcaad5dc9e76f6e613
2020-01-22 18:46:25 +00:00
Automerger Merge Worker
c605a940b7 audio: Add VTS for configurable engine am: b449cdb228 am: 45e735733f
Change-Id: Ifffffbd9471a6012f84232eab55fdcd5191601a3
2020-01-22 18:46:23 +00:00
Automerger Merge Worker
1574fade9f audio: update XSD for dynamic engine loading support config am: f282171776 am: bd5f74b53e
Change-Id: Ib90abda014d8e757c4649ae2fc58fe27f1148bd1
2020-01-22 18:46:21 +00:00
François Gaffie
eb3c4cbe0b Merge changes from topic "engine_vts"
am: 24a21c1b53

Change-Id: I5d66369c23ae9e146b6b5840f90433c72f6c2d45
2020-01-22 10:28:07 -08:00
Franois Gaffie
45e735733f audio: Add VTS for configurable engine
am: b449cdb228

Change-Id: I3c7f203ff6177fb5fd84905b08785959004c2cd8
2020-01-22 10:27:24 -08:00
Franois Gaffie
bd5f74b53e audio: update XSD for dynamic engine loading support config
am: f282171776

Change-Id: Iad1dae8b30398efd511cb9d1f568b1a65ff869de
2020-01-22 10:26:40 -08:00
Sarah Chin
9e397467a3 Merge changes from topics "multiplmn", "rplmn"
* changes:
  Add Multi-PLMN and CSG support
  Add Support for RPLMN to Voice and Data RegState
2020-01-22 18:26:37 +00:00
Treehugger Robot
24a21c1b53 Merge changes from topic "engine_vts"
* changes:
  audiopolicy: engine: Add VTS for engine configurable configuration
  audio: Add VTS for configurable engine
  audio: update XSD for dynamic engine loading support config
2020-01-22 18:06:28 +00:00
Kai Shi
872d6665a1 Merge "Wifi: add 3 new fields to ConnectionCapabilities." 2020-01-22 17:51:22 +00:00
Lev Proleev
aee67f83f9 Add ELU and HARD_SWISH
Bug: 147482068
Bug: 147481241
Test: NNTest_static and VtsHalNeuralnetworksV1_3TargetTest
Change-Id: Iab8da2a666ad9775dfb53d9297e94962fb651353
2020-01-22 17:16:41 +00:00
Lev Proleev
2d7c489f67 NNAPI: Regenerate types.hal to sync with types.spec
Bug: 147765446
Test: mma
Change-Id: I2b41bd959b7084ecb89674c659c66ebb158ac77d
2020-01-22 17:16:07 +00:00
Steven Moreland
758b8941c3 Merge "graphics: allow IAllocator 2.0 and IMapper to 2.1" 2020-01-22 17:13:42 +00:00
Michael Butler
9e638b54a0 Merge changes from topic "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-22 08:52:25 +00:00
Sarah Chin
3efba537fe Manual network selection by RAN type
Support updated API for setNetworkSelectionModeManual

Bug: 68116277
Test: atest FrameworksTelephonyTests
Change-Id: I7076da1734d2d020adef568188cb4f4b4914f379
2020-01-22 00:14:30 -08:00
Jack Yu
0b4c7fb404 Added NR band support
Added band info in cell identity.

Test: Telephony sanity tests
Bug: 131061889
Change-Id: I5205aa70db0d83fd049c5f25b0b427ab7484727b
2020-01-21 23:58:55 -08:00
Nathan Harold
500733c459 Add Multi-PLMN and CSG support
Non-functional changes:
-Clarify that the MCC+MNC in the CellIdentity should be used to
 report the Primary PLMN only; (this PLMN is globally unique, and
 can be used to construct a CGI/ECGI whereas other PLMN-IDs cannot).
-Add clarification for the reporting of multi-PLMN 5G networks.

Functional changes:
-Add a list of PLMNs for MOCN Networks. This allows cells that are
 shared by multiple operators to be properly reported.
-Add support for Closed Subscriber Group reporting to allow
 identification of small-cell deployments.

Bug: 135921133
Test: make VtsHalRadioV1_5Target
      && make aosp_cf_x86_64_phone-userdebug
Change-Id: Ibb0682de8ae9c4421e79086773c977a4e76ac4f1
2020-01-21 23:57:21 -08:00
Nathan Harold
8f6b67b0a6 Add Support for RPLMN to Voice and Data RegState
-Define RegistrationFailCause as an enum
-Combine voice and data reg state into a single struct
-Define a safe-union for AN-specific registration info

Bug: 73629308
Test: make && make VtsHalRadioV1_5TargetTest
      && make cf_x86_64_phone-userdebug

Change-Id: I43df3cffd4c55f2c5df8eaf0235772e5930dced5
2020-01-21 23:45:52 -08:00
Jack Yu
87d84d1346 Merge "Support IPv6 MTU in IRadio 1.5" 2020-01-22 07:38:52 +00:00
Hayden Gomes
255bce6229 Merge "Expanding AudioUsage to include new system usages" 2020-01-22 06:47:58 +00:00
Sarah Chin
f33c0b5561 Merge "PhoneCapabilities changes for device capabilities" 2020-01-22 04:20:43 +00:00
Sarah Chin
f7fd4fd720 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
2020-01-21 18:32:07 -08:00
Jack Yu
8c203498f8 Merge "Added TD-SCDMA bands for network scanning" 2020-01-22 01:13:21 +00:00
Michael Butler
616701d3cd Create VTS tests for QoS in NNAPI
Bug: 136739795
Bug: 142902514
Bug: 145300530
Test: mma
Test: VtsHalNeuralnetworksV1_3TargetTest
Change-Id: If3ab91cfb3158e4c33e809ff3b149dff47cda76f
2020-01-21 16:02:05 -08:00
Michael Butler
9449a28b2f Update NNAPI 1.3 VTS tests with new types
Bug: 136739795
Bug: 142902514
Bug: 145300530
Test: mma
Test: atest VtsHalNeuralnetworksV1_3TargetTest
Change-Id: Ie76da9dc9d6993a56bf644cfe20c5f5b421672c9
2020-01-21 16:02:05 -08:00
Michael Butler
c2499ecda1 Add Quality of Service to NNAPI HAL
This CL makes the following changes:
* introduces a new Priority enum
* extends ErrorStatus with new error codes
* adds "supportsDeadline" method to IDevice
* adds priority and deadline arguments to IDevice::prepareModel*
* adds deadline argument to IPreparedModel::execute*
* updates IExecutionCallback with new ErrorStatus
* updates current.txt accordingly

Bug: 136739795
Bug: 142902514
Bug: 145300530
Test: mma
Change-Id: Iaa7877bde1f463635b8bbdb4e8a001d7b79b9c65
2020-01-21 15:55:49 -08:00
Slava Shklyaev
fdb6b518e9 Merge "Add NNAPI control flow" 2020-01-21 23:22:45 +00:00
Slava Shklyaev
ffe909ac8c Merge "Remove neuralnetworks@1.3::Model.Extension* in favor of 1.2 counterparts" 2020-01-21 23:17:19 +00:00
Jason Macnak
32cc5ae339 graphics: allow IAllocator 2.0 and IMapper to 2.1
Allows IAllocator 2.0 and IMapper 2.1 so that Cuttlefish can advertise
API level 30 for R before 4.0 is implemented.

Bug: b/136016160
Test: Compiles and boots
Change-Id: I6d8ebc7013a2887521358b1ba73a2def14c20b9a
2020-01-21 23:12:17 +00:00
Automerger Merge Worker
0b3d0b99ea [automerger skipped] Merge "Updates to KM4.1" am: 7b37dc5d9c am: 7b1563832e am: 51ce8b1ee8 -s ours
am skip reason: Change-Id Iae7151e2d9b328dd73e5cd78e59687ef29bab4f0 with SHA-1 2d7394209e is in history

Change-Id: I89129382b211b8c244040d2d48143aaf6c760bd1
2020-01-21 21:46:30 +00:00
Automerger Merge Worker
51ce8b1ee8 Merge "Updates to KM4.1" am: 7b37dc5d9c am: 7b1563832e
Change-Id: I6fe11f610788c61e45a2aa7eb8c33af367e3f8d8
2020-01-21 21:34:11 +00:00
Shawn Willden
7b1563832e Merge "Updates to KM4.1"
am: 7b37dc5d9c

Change-Id: Id104154ff22b642507fa71d2cd976ca36188c6e9
2020-01-21 13:21:35 -08:00
Shawn Willden
7b37dc5d9c Merge "Updates to KM4.1" 2020-01-21 21:18:21 +00:00
Shawn Willden
26a803beef Merge "Add support lib wrappers for clients" 2020-01-21 20:48:20 +00:00
TreeHugger Robot
c78e55d510 Merge changes I48840207,Idc5de13c,I8f2b7ab3,I2460106c
* changes:
  Keymaster 4.1 VTS tests
  Update KM4 VTS tests to allow s/w implementation to pass.
  Remove service death test.
  Change finish input test to avoid large sizes.
2020-01-21 20:47:04 +00:00
Automerger Merge Worker
8999898f9c Merge "Update Keymaster support lib OWNERS" am: f7238c9c01 am: e65c023c44 am: d8fd3aa17e
Change-Id: Ib7f6d20166de39022ec202450225ac90e6322842
2020-01-21 18:10:02 +00:00
Automerger Merge Worker
d8fd3aa17e Merge "Update Keymaster support lib OWNERS" am: f7238c9c01 am: e65c023c44
Change-Id: I77e313a681028dd8c1e92a8c51f974d478219a23
2020-01-21 17:59:28 +00:00
Shawn Willden
e65c023c44 Merge "Update Keymaster support lib OWNERS"
am: f7238c9c01

Change-Id: I25ea9632fa5d85ac198846a78d48d8f9004775af
2020-01-21 09:44:35 -08:00
Jack Yu
c2143480f8 Added TD-SCDMA bands for network scanning
Added TD-SCDMA bands defined in 3GPP TS 25.102.

Test: Telephony sanity tests
Bug: 144939345
Change-Id: Ib1881ed41e6427edd294bb7af6f914baeb40d8f2
2020-01-21 09:42:46 -08:00
Shawn Willden
f7238c9c01 Merge "Update Keymaster support lib OWNERS" 2020-01-21 17:40:38 +00:00
Shawn Willden
c0125fb930 Update Keymaster support lib OWNERS
Test:  VtsHalKeymasterV4_0TargetTest && VtsHalKeymasterV4_1TargetTest
Change-Id: Ibc719cdc4bd8821d67659eb6a2cf4d0094322322
Merged-In: Ibc719cdc4bd8821d67659eb6a2cf4d0094322322
2020-01-21 10:30:29 -07:00
Shawn Willden
d8db4439ce Merge changes from topic "update_km4_vts"
* changes:
  Update Keymaster 4.0 VTS to use parameterized tests.
  Remove dependency on libsoftkeymaster.
2020-01-21 14:46:39 +00:00
Slava Shklyaev
a785a3faac Add NNAPI control flow
Bug: 136735929
Bug: 139181916
Test: m
Change-Id: I7a75175f00fc98df626c40ea669021ccd40130e0
2020-01-21 13:39:22 +00:00
Slava Shklyaev
8a179f3499 Remove neuralnetworks@1.3::Model.Extension* in favor of 1.2 counterparts
The types are the same as in 1.2. No changes are expected.

Bug: 136735929
Test: m
Change-Id: I7431d2e9263fafa0e63b8b1b40f6715e3832d17c
2020-01-21 11:39:02 +00:00