Commit Graph

17334 Commits

Author SHA1 Message Date
David Anderson
21ed9de1fb Introduce IBootControl 1.1.
libsnapshot needs to communicate to the bootloader that a merge is in
progress. This can be used to prevent factory data resets, prevent
flashing or wiping userdata/metadata, and warning when the active slot
changes.

Bug: 138861550
Test: builds
Change-Id: I577877696b5ec6920b9520d518374931ce9ddfaa
2019-10-07 12:32:55 -07:00
TreeHugger Robot
8beed0b7be Merge "Edit a comment to reflect an actual enum type name" 2019-10-05 01:09:40 +00:00
Michael Butler
f0ff36bf60 Merge "Increase neuralnetworks compatibility to 1.3" 2019-10-04 23:33:25 +00:00
Yi Kong
17c943bc5a strtoul result shouldn't be narrowed to uint32_t before checking for ULONG_MAX am: 69e8325e5d am: 0d5b2cf54c am: 363f166f2d
am: 41e7b8573b

Change-Id: Iddbbf71f2aa763e1e7daf33a379daf7ca1f06733
2019-10-04 15:03:43 -07:00
Yi Kong
41e7b8573b strtoul result shouldn't be narrowed to uint32_t before checking for ULONG_MAX am: 69e8325e5d am: 0d5b2cf54c
am: 363f166f2d

Change-Id: I3861d03a46819d50a8ecd5dec8aa06af138c2ed7
2019-10-04 14:51:38 -07:00
Yi Kong
363f166f2d strtoul result shouldn't be narrowed to uint32_t before checking for ULONG_MAX am: 69e8325e5d
am: 0d5b2cf54c

Change-Id: Ifd02485ac4f2e73addf39f4ba0b6e2b32ca9e9c8
2019-10-04 14:45:33 -07:00
Yi Kong
0d5b2cf54c strtoul result shouldn't be narrowed to uint32_t before checking for ULONG_MAX
am: 69e8325e5d

Change-Id: Id68341a6b3b8c8f6c470581a6fe67db5ceea2cec
2019-10-04 14:38:30 -07:00
Michael Butler
7259f3ab24 Increase neuralnetworks compatibility to 1.3
Bug: 139120468
Test: mma
Change-Id: Ic41febe005dfefe834587ec67fdda52e112c37cb
2019-10-04 14:36:01 -07:00
Yi Kong
69e8325e5d strtoul result shouldn't be narrowed to uint32_t before checking for ULONG_MAX
... otherwise this is always false.

Test: presubmit
Bug: 72331526
Change-Id: Ie1262ebf2eff4143bbef7b9d473c8ac5b7c9ffe4
2019-10-04 12:29:28 -07:00
Enrico Granata
a0cbe5804e Edit a comment to reflect an actual enum type name
There is nothing named enum_vehicle_ap_power_state_shutdown_param_type
in the Vehicle HAL source tree. The right greppable type name is
VehicleApPowerStateShutdownParam.

Test: git diff
Change-Id: Ib6c8be491df9aa6cb3143b28a12b70bd4b8c29cc
2019-10-04 11:14:50 -07:00
Lev Proleev
b58075603a Merge changes from topic "NNAPI v1.3"
* changes:
  Modify NNAPI VTS tests to run on version 1.3
  Copy VTS tests from v1.2 to v1.3
  Create NNAPI HAL v1.3 and add TENSOR_QUANT8_ASYMM_SIGNED OperandType
2019-10-04 15:34:10 +00:00
David Gross
2cae5c8b01 Replace sync_enums_to_hal.py with generate_api.{py,sh} and regenerate */types.hal
There are certain pieces of NeuralNetworks.h and of our various *.hal
files that ought to be kept in sync -- most notably the operand type
and operation type definitions and descriptions in our
NeuralNetworks.h and types.hal files.  To avoid having to do this
manually, a tool can be employed.

The old solution to this problem is sync_enums_to_hal.py, which parses
the existing NeuralNetworks.h and types.hal files, and then rewrites
the types.hal files: It identifies the operand type and operation type
portions of the files, and in the types.hal files replaces them with
transformed versions of the portions from NeuralNetworks.h.  This
approach is brittle -- it is very sensitive to the structure of the
files, as was recognized when this tool was created.  Changes to those
files since the script was last updated essentially broke the script,
as noted in http://b/140132458.

The new solution employs a new tool generate_api.py to combine a
single "specification file" with one "template file" per API file
(NeuralNetworks.h or types.hal) to produce that API file.  The script
generate_api.sh invokes generate_api.py once per API file, passing
appropriate arguments.  See frameworks/ml/nn/tools/api/README.md for
more details.

In the process of combining information from NeuralNetworks.h and
*/types.hal, some formatting, syntactic, and semantic changes have
been made to those files.  For example:
- types.hal files no longer refer to API levels or (similarly)
  to HAL versions other than earlier HAL versions

Bug: 130169064
Bug: 140132458

Test: cd neuralnetworks ; mma

Change-Id: Iceb38effc2c7e6c32344e49225b85256144c0945
2019-10-03 14:14:20 -07:00
Steven Moreland
4f9195a6a9 Merge "dumpstate example: use new lazy hal mechanism" am: 60d9b98423 am: 045e3f99fc am: 8a27154f79
am: 4aab170ba2

Change-Id: I63fae0e5dc2cdf2bf4badf8924195bcc79387024
2019-10-03 14:08:51 -07:00
Steven Moreland
4aab170ba2 Merge "dumpstate example: use new lazy hal mechanism" am: 60d9b98423 am: 045e3f99fc
am: 8a27154f79

Change-Id: I367ddc344691e8ff6306045d412174059f96d507
2019-10-03 13:59:45 -07:00
Steven Moreland
8a27154f79 Merge "dumpstate example: use new lazy hal mechanism" am: 60d9b98423
am: 045e3f99fc

Change-Id: I467f52b78090dc98e01ada782188bbd45b887339
2019-10-03 13:43:20 -07:00
Steven Moreland
045e3f99fc Merge "dumpstate example: use new lazy hal mechanism"
am: 60d9b98423

Change-Id: I5652f0bf8cdac693158c9932b0b5942d7bd9d0fb
2019-10-03 13:29:49 -07:00
Mikhail Naganov
0a33c65bf0 [automerger skipped] Merge "Fix the name of the constant for device [dis]connect parameter" am: 998c4cd02f am: a8770db02d am: ad3bf06a89
am: 9c075cc251 -s ours
am skip reason: change_id I18e1e3fccad3d41372f3c5c046af4f6ffd83328b with SHA1 98f2715168 is in history

Change-Id: I894458e14b952642594dca191fde39211d9c4026
2019-10-03 13:24:11 -07:00
Mikhail Naganov
9c075cc251 Merge "Fix the name of the constant for device [dis]connect parameter" am: 998c4cd02f am: a8770db02d
am: ad3bf06a89

Change-Id: I20826e0229db5596bb5e7ecffab274542f735931
2019-10-03 13:17:21 -07:00
Mikhail Naganov
ad3bf06a89 Merge "Fix the name of the constant for device [dis]connect parameter" am: 998c4cd02f
am: a8770db02d

Change-Id: Icde1704bd46642567050f4704d4d65ac9ad96845
2019-10-03 13:10:16 -07:00
Treehugger Robot
60d9b98423 Merge "dumpstate example: use new lazy hal mechanism" 2019-10-03 20:00:34 +00:00
Mikhail Naganov
a8770db02d Merge "Fix the name of the constant for device [dis]connect parameter"
am: 998c4cd02f

Change-Id: I66092fdf4e02c2631116d1c1b670ec169fd4a0ab
2019-10-03 12:57:08 -07:00
TreeHugger Robot
5e23b605ce Merge "vibrator: Async Callback API VTS Tests" 2019-10-03 19:49:41 +00:00
TreeHugger Robot
dd7ddab13e Merge "composer: Add getDisplayConnectionType" 2019-10-03 19:47:13 +00:00
Treehugger Robot
998c4cd02f Merge "Fix the name of the constant for device [dis]connect parameter" 2019-10-03 19:44:44 +00:00
Mikhail Naganov
36678b2b16 Fix the name of the constant for device [dis]connect parameter
During the transition to Treble, "device connect" / "disconnect"
parameter was erroneously attributed to audio streams. This
issue got fixed in Audio HAL V4.0, but AudioParameter file
was still using incorrect name for the constant.

Test: make
Change-Id: I18e1e3fccad3d41372f3c5c046af4f6ffd83328b
Merged-In: I18e1e3fccad3d41372f3c5c046af4f6ffd83328b
2019-10-03 09:46:13 -07:00
Alistair Delva
fc8d43692c Merge "Make gralloc0 pass-through mapper handle layers" am: b756e23e5c am: 6982d1aec5 am: 6c3213c940
am: afc577e108

Change-Id: I54f2e01bf8ffe43dbe786a73cfd7818661230090
2019-10-03 06:48:29 -07:00
Alistair Delva
afc577e108 Merge "Make gralloc0 pass-through mapper handle layers" am: b756e23e5c am: 6982d1aec5
am: 6c3213c940

Change-Id: I4a2289ef124970485b6ae273131f9ed33bec20bc
2019-10-03 06:41:48 -07:00
Alistair Delva
6c3213c940 Merge "Make gralloc0 pass-through mapper handle layers" am: b756e23e5c
am: 6982d1aec5

Change-Id: Ie5bafe1ae8851aa8a79a76024f652b575380c170
2019-10-03 06:35:37 -07:00
Alistair Delva
6982d1aec5 Merge "Make gralloc0 pass-through mapper handle layers"
am: b756e23e5c

Change-Id: I9f5948a862ead71ed745cf1cfca8df2088b3ab59
2019-10-03 06:29:36 -07:00
Alistair Delva
b756e23e5c Merge "Make gralloc0 pass-through mapper handle layers" 2019-10-03 13:02:13 +00:00
Harpreet \"Eli\" Sangha
67e91107c6 vibrator: Async Callback API VTS Tests
Bug: 136220871
Test: VTS Tests
Change-Id: Icd8f794df76542c9f74e3ea762117da703db47d4
Signed-off-by: Harpreet \"Eli\" Sangha <eliptus@google.com>
2019-10-03 15:09:01 +09:00
Harpreet "Eli" Sangha
6502c57b92 Merge "vibrator: Support Async Callback APIs" 2019-10-03 05:18:18 +00:00
Steven Moreland
1f4d49f896 dumpstate example: use new lazy hal mechanism
hwservicemanager will now shutdown the service when it is not in use.
This puts less restrictions on clients.

Bug: N/A
Test: build only (this is an example implementation not used on any
    device)

Change-Id: I4641e727f6e4c3ca5d97d53a66b3cc0fee6f12f3
2019-10-02 17:01:40 -07:00
Jim Kaye
74d26d9601 [automerger skipped] Merge "Change AP_POWER_STATE_REPORT's access property." am: 86331df20a am: a53b19fb08 am: 7a473c66f7
am: 2b1e5cb620 -s ours
am skip reason: change_id Ic4c7f1d66a4fdee1cfb8b9da42cf76bc7aed5948 with SHA1 44d525b68b is in history

Change-Id: I3d77bc80e4f917fcb1ec07a400fc9439959a93a6
2019-10-02 16:37:57 -07:00
Jim Kaye
2b1e5cb620 Merge "Change AP_POWER_STATE_REPORT's access property." am: 86331df20a am: a53b19fb08
am: 7a473c66f7

Change-Id: I48dad550404620168c74cc2b3ef2f321020ee014
2019-10-02 16:10:43 -07:00
Jim Kaye
7a473c66f7 Merge "Change AP_POWER_STATE_REPORT's access property." am: 86331df20a
am: a53b19fb08

Change-Id: I08c5d54ff2fe7e0e4bb8f78699d7d88778d221ec
2019-10-02 16:03:58 -07:00
Jim Kaye
a53b19fb08 Merge "Change AP_POWER_STATE_REPORT's access property."
am: 86331df20a

Change-Id: I640166d093da89996e922aab032dcf108c89afe5
2019-10-02 15:55:55 -07:00
Jim Kaye
86331df20a Merge "Change AP_POWER_STATE_REPORT's access property." 2019-10-02 22:41:37 +00:00
Dominik Laskowski
ce44a4b363 composer: Add getDisplayConnectionType
Distinguish between internal and external displays, to obviate assuming
that the first display is internal and subsequent displays are external.

Note that connector types (e.g. DSI, HDMI, DisplayPort) are not enumerated,
since that information is irrelevant for internal connections, and can be
extracted from the EDID for external connections in the few cases where it
matters, e.g. gating features like daisy chaining and content protection.

Bug: 134771872
Test: Build
Change-Id: I8a27e4ef569626620711910fcbaed5a7e12e6870
2019-10-02 15:10:41 -07:00
Steven Moreland
82b84148c7 Remove libhwbinder/libhidltransport deps
Since these were combined into libhidlbase.

Bug: 135686713
Test: build only (libhwbinder/libhidltransport are empty)
Change-Id: I878a4d04e65ef13f3a0ebaf64177f673958d213c
2019-10-02 12:50:29 -07:00
Patrik Fimml
809249059c Wifi 1.3: Fix STA getFactoryMacAddress test.
It's valid for individual bytes in a MAC address to be zero as long as
they're not all zero.

Bug: 132705022
Bug: 141916952
Test: m -j32 vts && vts-tradefed run vts-hal --skip-preconditions --module VtsHalWifiV1_3Target
Change-Id: Ic33a3b80cce90eb4b031aca33aa66bf2a375dc16
2019-10-02 17:02:45 +02:00
Lev Proleev
b49dadfb64 Modify NNAPI VTS tests to run on version 1.3
Bug: 139120468
Test: VtsHalNeuralnetworksV1_3TargetTest
Change-Id: Id9e4d99852da8a3d5167ab7464c0e71885250501
2019-10-02 13:45:02 +01:00
Lev Proleev
3b13b55ac1 Copy VTS tests from v1.2 to v1.3
So that it's easier to see what actually has changed in VTS tests for
version 1.3

Bug: 139120468
Test: m
Change-Id: Ief294d21349ca6531595612a16fa3ae3382f83ac
2019-10-02 13:45:02 +01:00
Lev Proleev
5a7b67ab8f Create NNAPI HAL v1.3 and add TENSOR_QUANT8_ASYMM_SIGNED OperandType
Bug: 137828494
Bug: 139120468
Bug: 136735770
Test: mma
Change-Id: I1f615047d1c0c208a90082ffb6ffc43f252f77b4
2019-10-02 13:44:52 +01:00
Rob Barnes
147f26b1ea Merge "Add Keymaster VTS tests for some AES cases:" am: 772fb53999 am: 0baa38ed55 am: 0eb84f484a
am: e70544b15c

Change-Id: Id496d05e590aa8e1e9f2c78bdc21306e8c839faa
2019-10-02 01:29:54 -07:00
Rob Barnes
e70544b15c Merge "Add Keymaster VTS tests for some AES cases:" am: 772fb53999 am: 0baa38ed55
am: 0eb84f484a

Change-Id: I98a22cb381a13df5e64e394ff16e2b2b22f02b0e
2019-10-02 01:23:35 -07:00
Rob Barnes
0eb84f484a Merge "Add Keymaster VTS tests for some AES cases:" am: 772fb53999
am: 0baa38ed55

Change-Id: I6515f4b505bf58cb17d32e09ee2f0ce3cc98e9c1
2019-10-02 01:16:00 -07:00
Rob Barnes
0baa38ed55 Merge "Add Keymaster VTS tests for some AES cases:"
am: 772fb53999

Change-Id: I6ad8fc6a90a29a59a6f927ed0160565e6be671c1
2019-10-02 01:08:41 -07:00
Harpreet "Eli" Sangha
9f290826b8 vibrator: Support Async Callback APIs
Bug: 136220871
Test: Manually via 'cmd vibrator'
Change-Id: I4201538e4b2e663ac0215c1deb1047658f4d602e
2019-10-02 16:17:16 +09:00
Treehugger Robot
772fb53999 Merge "Add Keymaster VTS tests for some AES cases:" 2019-10-02 07:04:26 +00:00