OSDN Git Service

android-x86/hardware-interfaces.git
7 years agoFix getKeyRequest legacy HAL returning invalid status
Jeff Tinker [Tue, 7 Mar 2017 00:58:47 +0000 (16:58 -0800)]
Fix getKeyRequest legacy HAL returning invalid status

bug: 36006198

Test: drm hal vts test
Change-Id: Ie3125b4459add4fd30dc418f92ab0f51d8fcc73b

7 years agoMerge "Convert all comments into "doxygen-ready" comments." into oc-dev
Andreas Huber [Wed, 29 Mar 2017 18:48:36 +0000 (18:48 +0000)]
Merge "Convert all comments into "doxygen-ready" comments." into oc-dev

7 years agoConvert all comments into "doxygen-ready" comments.
Andreas Huber [Tue, 28 Mar 2017 23:19:16 +0000 (16:19 -0700)]
Convert all comments into "doxygen-ready" comments.

Bug: 36453077
Test: mma
Change-Id: I0b1f77dfae5d2258969e33d85ecf45401ffbdfaa

7 years agoAdd keymaster VTS tests.
Shawn Willden [Fri, 2 Dec 2016 12:07:02 +0000 (05:07 -0700)]
Add keymaster VTS tests.

Note: Recent Google devices have keymaster implementations that don't
pass this test suite.  See https://goo.gl/6hsGwa for a summary.

Bug: 32022681
Test: This is the test suite.
Change-Id: Ib200b68e0c7844df02eb9f086385d6c36e306d45

7 years agoConvert all comments into "doxygen-ready" comments.
Andreas Huber [Tue, 28 Mar 2017 21:40:58 +0000 (14:40 -0700)]
Convert all comments into "doxygen-ready" comments.

Bug: 36453077
Test: make
Change-Id: Ic77394d4d2e1ccedba3a28230d870c5d6108bd40

7 years agoMerge "Use gralloc usage conversion library" into oc-dev
TreeHugger Robot [Tue, 28 Mar 2017 20:55:50 +0000 (20:55 +0000)]
Merge "Use gralloc usage conversion library" into oc-dev

7 years agoUse gralloc usage conversion library
Jesse Hall [Thu, 23 Mar 2017 23:40:59 +0000 (16:40 -0700)]
Use gralloc usage conversion library

Converting from ..graphics.allocator@2.0 usage to gralloc0 usage isn't
quite as simple as ORing and truncating, which is what the default
implementation was doing. Switch to using library functions that do it
correctly.

Test: boot bullhead
Change-Id: I40ae00e9aad92b374f281569207972b7461a3e55

7 years agoUpdate makefiles for hwtypes.h
Steven Moreland [Mon, 27 Mar 2017 18:48:14 +0000 (11:48 -0700)]
Update makefiles for hwtypes.h

Test: pass
Change-Id: I8e17eb8fec5d2f04c526476a866c8dd54ccb556c

7 years agoMerge "Add missing LOW_LATENCY_OFFBODY_DETECT handling"
Ben Fennema [Tue, 28 Mar 2017 04:29:31 +0000 (04:29 +0000)]
Merge "Add missing LOW_LATENCY_OFFBODY_DETECT handling"

7 years agoMerge "Fingerprint vts tests."
TreeHugger Robot [Tue, 28 Mar 2017 04:17:46 +0000 (04:17 +0000)]
Merge "Fingerprint vts tests."

7 years agoMerge "Revert "Add auth token parsing to IKeymasterDevice.hal""
TreeHugger Robot [Tue, 28 Mar 2017 02:37:45 +0000 (02:37 +0000)]
Merge "Revert "Add auth token parsing to IKeymasterDevice.hal""

7 years agoRevert "Add auth token parsing to IKeymasterDevice.hal"
Shawn Willden [Tue, 28 Mar 2017 00:40:57 +0000 (00:40 +0000)]
Revert "Add auth token parsing to IKeymasterDevice.hal"

This reverts commit 62f63c7ddbd08737e298a97975754225e5da0126.

Reason for revert: b/36637075

Bug: 36637075
Change-Id: Ie0e8d0b480047a7c68f266e7e5d8a31722f85128

7 years agoMerge "Sync the constants in HAL and framework"
TreeHugger Robot [Tue, 28 Mar 2017 00:02:18 +0000 (00:02 +0000)]
Merge "Sync the constants in HAL and framework"

7 years agowifi(implementation): Stop loading vendor library statically am: 34e4bc4dd2 am: c17e4...
Roshan Pius [Mon, 27 Mar 2017 22:36:14 +0000 (22:36 +0000)]
wifi(implementation): Stop loading vendor library statically am: 34e4bc4dd2 am: c17e4e07ac
am: 0e5e51175c

Change-Id: Ib1e6cc90a4388e49fda3608fb193e15fb66aef80

7 years agowifi(implementation): Stop loading vendor library statically am: 34e4bc4dd2
Roshan Pius [Mon, 27 Mar 2017 22:33:13 +0000 (22:33 +0000)]
wifi(implementation): Stop loading vendor library statically am: 34e4bc4dd2
am: c17e4e07ac

Change-Id: I843085db6544dd9c14feb611b709f48e6284c901

7 years agowifi(implementation): Stop loading vendor library statically
Roshan Pius [Mon, 27 Mar 2017 22:30:43 +0000 (22:30 +0000)]
wifi(implementation): Stop loading vendor library statically
am: 34e4bc4dd2

Change-Id: I614a2074fbc2d82618eeb72002724830cf888dab

7 years agowifi(implementation): Stop loading vendor library statically
Roshan Pius [Mon, 27 Mar 2017 16:23:12 +0000 (09:23 -0700)]
wifi(implementation): Stop loading vendor library statically

libwifi-hal statically imports the vendor implementation of the legacy
HAL. Since the HIDL daemon is dynamically linking against libwif-hal,
there is no need for it to statically import the vendor implementation
library (one pointed to by: $LIBWIFI-HAL variable).

Bug: 36169790
Test: Compiles & device is able to connect to wifi networks with the
change.

Change-Id: Ie44b58328f9bdde011ba6d4a4d26f786c2d097e7

7 years agoFingerprint vts tests.
Kevin Chyn [Tue, 21 Mar 2017 20:36:24 +0000 (13:36 -0700)]
Fingerprint vts tests.

Fix callback mechanism. Add tests for uncovered interfaces.

Test: make vts && adb push
out/host/linux-x86/vts/android-vts/testcases/DATA/nativetest64/VtsHalBiometricsFingerprintV2_1TargetTest/VtsHalBiometricsFingerprintV2_1TargetTest
/data/local/tmp/ && adb shell
./data/local/tmp/VtsHalBiometricsFingerprintV2_1TargetTest
Bug: 32022721
Change-Id: Ibeb955bfb937d9f23f98a2e073235aa745183e94

7 years agoSync the constants in HAL and framework
Shubang [Tue, 21 Mar 2017 20:00:51 +0000 (13:00 -0700)]
Sync the constants in HAL and framework

Test: build and flash device.

Bug: 36233336
Change-Id: I8134b8bded5e31561a97938bdf86a43f7c2b6dc5

7 years agoMerge "audiohal: Add crash tests for some methods of IEffect"
TreeHugger Robot [Mon, 27 Mar 2017 17:57:55 +0000 (17:57 +0000)]
Merge "audiohal: Add crash tests for some methods of IEffect"

7 years agoUpdate makefiles. am: e90c31f125 am: f11981de68
Steven Moreland [Mon, 27 Mar 2017 17:51:28 +0000 (17:51 +0000)]
Update makefiles. am: e90c31f125 am: f11981de68
am: 103bada0e1

Change-Id: Ibe6eeeacab5660a8cf70d59dd9a4864d6f70ab80

7 years agoUpdate makefiles. am: e90c31f125
Steven Moreland [Mon, 27 Mar 2017 17:48:27 +0000 (17:48 +0000)]
Update makefiles. am: e90c31f125
am: f11981de68

Change-Id: Icf25d969d83dff9653435d5fff0edb6b274a9d9f

7 years agoUpdate makefiles.
Steven Moreland [Mon, 27 Mar 2017 17:45:26 +0000 (17:45 +0000)]
Update makefiles.
am: e90c31f125

Change-Id: I370a9a20b005d7510463594b24e5c4fc8791116a

7 years agoUpdate makefiles.
Steven Moreland [Sat, 25 Mar 2017 04:50:45 +0000 (21:50 -0700)]
Update makefiles.

Test: pass
Change-Id: I925baccbe51a32b7b7f3f66cf2918d017ee6b039

7 years agoAdd auth token parsing to IKeymasterDevice.hal
Shawn Willden [Fri, 17 Feb 2017 19:23:51 +0000 (12:23 -0700)]
Add auth token parsing to IKeymasterDevice.hal

Auth tokens have an unfortunate dual character. To most of the system
they are opaque blobs that are intended only to be obtained from one
HAL (e.g. gatekeeper or fingerprint) and passed to another
HAL (keymaster), but keystore actually needs to extract some bits of
information from them in order to determine which of the available blobs
should be provided for a given keymaster key operation.

This CL adds a method that resolves this dual nature by moving the
responsibility of parsing blobs to the HAL so that no component of the
framework has to make any assumptions about their content and all can
treat them as fully opaque. This still means that the various HAL
implementers have to agree on content, but they also have to agree on an
HMAC key which much be securely distributed to all at every boot, so
asking them to agree on an auth token format is perfectly
acceptable. But now the Android system doesn't have to care about the
format.

Bug: 32962548
Test: CTS tests pass, plus manual testing.
Change-Id: I78aa6e4ea9c5d8f34906b0969909387e2c5894e6

7 years agoNote that auth token is opaque.
Shawn Willden [Wed, 1 Mar 2017 13:36:26 +0000 (06:36 -0700)]
Note that auth token is opaque.

Change-Id: I788ab8c5be630dd818a9a442c487c3451029bf81
Test: N/A, comment-only change
Bug: 34985116

7 years agoAdd missing LOW_LATENCY_OFFBODY_DETECT handling
Ben Fennema [Sat, 25 Mar 2017 01:45:50 +0000 (18:45 -0700)]
Add missing LOW_LATENCY_OFFBODY_DETECT handling

Bug: 36580454
Test: unlock watch with LLOB sensor and verify no SensorService crash
Change-Id: Ib1d086efd80e829bb844521fa39325f095b1c2c9
Signed-off-by: Ben Fennema <fennema@google.com>
7 years agoAdd digest support and implementation name to getHardwareFeatures
Shawn Willden [Thu, 23 Feb 2017 18:01:49 +0000 (11:01 -0700)]
Add digest support and implementation name to getHardwareFeatures

This is needed to support the keystore statistics gathering initiative.
It will allow us to get information about what kinds of keymaster
implementations exist in the ecosystem, and which ones fail in which
ways.

Bug: 36549319
Test: Will add to VTS tests
Change-Id: I49ee4623656060d69a6de7723b11cd715150451a

7 years agoMerge "Remove viral readproc group dependency."
TreeHugger Robot [Sat, 25 Mar 2017 00:58:57 +0000 (00:58 +0000)]
Merge "Remove viral readproc group dependency."

7 years agoaudiohal: Add crash tests for some methods of IEffect
Mikhail Naganov [Sat, 25 Mar 2017 00:06:25 +0000 (17:06 -0700)]
audiohal: Add crash tests for some methods of IEffect

For methods that can't be meaningfully tested, add tests
verifying that they at least don't crash.

Bug: 32022706
Change-Id: I234c2ae4b6bc173450cf50e8749ea966cbc2d2a2
Test: this is a test

7 years agoMerge "Remove GENERIC_FAILURE and INVALID_ARGUMENT for Api documentation" am: 2d0b636...
Shuo Qian [Fri, 24 Mar 2017 17:30:27 +0000 (17:30 +0000)]
Merge "Remove GENERIC_FAILURE and INVALID_ARGUMENT for Api documentation" am: 2d0b636b29 am: 0efe019342
am: 56fc4104b9

Change-Id: Ia37f47663ce7932c9d294512b7af011849e27c97

7 years agoMerge "Remove GENERIC_FAILURE and INVALID_ARGUMENT for Api documentation" am: 2d0b636b29
Shuo Qian [Fri, 24 Mar 2017 17:27:54 +0000 (17:27 +0000)]
Merge "Remove GENERIC_FAILURE and INVALID_ARGUMENT for Api documentation" am: 2d0b636b29
am: 0efe019342

Change-Id: I6a2cc30754413eccb59ba775c14863852a89fefc

7 years agoMerge "Remove GENERIC_FAILURE and INVALID_ARGUMENT for Api documentation"
Shuo Qian [Fri, 24 Mar 2017 17:26:26 +0000 (17:26 +0000)]
Merge "Remove GENERIC_FAILURE and INVALID_ARGUMENT for Api documentation"
am: 2d0b636b29

Change-Id: I342068f8bbcf6a97c322bcf0049fed83b519bcda

7 years agoMerge "Remove GENERIC_FAILURE and INVALID_ARGUMENT for Api documentation"
Shuo Qian [Fri, 24 Mar 2017 17:21:17 +0000 (17:21 +0000)]
Merge "Remove GENERIC_FAILURE and INVALID_ARGUMENT for Api documentation"

7 years agoMerge "[WIFI] Restore initialization code" am: 8f4416aabb am: 3ae14f0ead
Etan Cohen [Fri, 24 Mar 2017 16:17:14 +0000 (16:17 +0000)]
Merge "[WIFI] Restore initialization code" am: 8f4416aabb am: 3ae14f0ead
am: 058ed46d36

Change-Id: I8c2a70819cf1acf8b6edd8743f7c536a580ce66a

7 years agoMerge "[WIFI] Restore initialization code" am: 8f4416aabb
Etan Cohen [Fri, 24 Mar 2017 16:15:13 +0000 (16:15 +0000)]
Merge "[WIFI] Restore initialization code" am: 8f4416aabb
am: 3ae14f0ead

Change-Id: I96f5c77e7f9ee3b84f4a6cf7973638d3d4bba68d

7 years agoMerge "Add background scan routines and callbacks to broadcast radio HAL."
Tomasz Wasilczyk [Fri, 24 Mar 2017 16:14:21 +0000 (16:14 +0000)]
Merge "Add background scan routines and callbacks to broadcast radio HAL."

7 years agoMerge "Improved GNSS HAL VTS test coverage"
Wyatt Riley [Fri, 24 Mar 2017 16:13:24 +0000 (16:13 +0000)]
Merge "Improved GNSS HAL VTS test coverage"

7 years agoMerge "[WIFI] Restore initialization code"
Etan Cohen [Fri, 24 Mar 2017 16:12:43 +0000 (16:12 +0000)]
Merge "[WIFI] Restore initialization code"
am: 8f4416aabb

Change-Id: I9f0f828d542e337f185c4a423748f57ef53a00ce

7 years agoMerge "[WIFI] Restore initialization code"
Etan Cohen [Fri, 24 Mar 2017 16:08:55 +0000 (16:08 +0000)]
Merge "[WIFI] Restore initialization code"

7 years agoMerge "Handle hidl transaction errors in ConfigStore"
TreeHugger Robot [Fri, 24 Mar 2017 05:50:22 +0000 (05:50 +0000)]
Merge "Handle hidl transaction errors in ConfigStore"

7 years agoMerge "removed unused function (HIDL_FETCH_ISurfaceFlingerConfigs)" am: d5934d06f1...
Jaesoo Lee [Fri, 24 Mar 2017 03:32:06 +0000 (03:32 +0000)]
Merge "removed unused function (HIDL_FETCH_ISurfaceFlingerConfigs)" am: d5934d06f1 am: 1d5ccbd5ea
am: a0032e3990  -s ours

Change-Id: I9281cd8f52e698505d921d4f1094c823ab102b1d

7 years agoMerge "removed unused function (HIDL_FETCH_ISurfaceFlingerConfigs)" am: d5934d06f1
Jaesoo Lee [Fri, 24 Mar 2017 03:29:34 +0000 (03:29 +0000)]
Merge "removed unused function (HIDL_FETCH_ISurfaceFlingerConfigs)" am: d5934d06f1
am: 1d5ccbd5ea

Change-Id: Idccb5e03b143ec2462479e32d0bd20555d32cd63

7 years agoMerge "removed unused function (HIDL_FETCH_ISurfaceFlingerConfigs)"
Jaesoo Lee [Fri, 24 Mar 2017 03:27:35 +0000 (03:27 +0000)]
Merge "removed unused function (HIDL_FETCH_ISurfaceFlingerConfigs)"
am: d5934d06f1

Change-Id: I958c1285dbb5e3c6db8145ac743cedfb61cd544c

7 years agoMerge "removed unused function (HIDL_FETCH_ISurfaceFlingerConfigs)"
Jaesoo Lee [Fri, 24 Mar 2017 03:23:26 +0000 (03:23 +0000)]
Merge "removed unused function (HIDL_FETCH_ISurfaceFlingerConfigs)"

7 years ago[WIFI] Restore initialization code
Etan Cohen [Thu, 23 Mar 2017 15:11:47 +0000 (08:11 -0700)]
[WIFI] Restore initialization code

Restore the usage of WIFI-specific main function. The main
function was inadvertantly disabled by moving it into a static
library - which caused the default main to be used.

Need a custom main since need to stop WIFI before tests start
to enforce a clean starting point.

Bug: 35276551
Test: confirms custom main routine is called
Change-Id: I978827bc0f0f16d9ca4f159fbf42d0bc53f5df99

7 years agoMerge "Verify all radio classes, instead of FM only."
Tomasz Wasilczyk [Thu, 23 Mar 2017 23:15:02 +0000 (23:15 +0000)]
Merge "Verify all radio classes, instead of FM only."

7 years agoImproved GNSS HAL VTS test coverage
Wyatt Riley [Wed, 22 Mar 2017 21:08:26 +0000 (14:08 -0700)]
Improved GNSS HAL VTS test coverage

Calling all extension APIs, and checking some exist
Calling delete and inject methods
Checking measurement capabilties

Bug:32022567
Test: Passes on Pixel XL with O
Change-Id: I86d5416b08c91e4d96eff6ba8f88e50e0544540b

7 years agoAdd background scan routines and callbacks to broadcast radio HAL.
Tomasz Wasilczyk [Mon, 13 Mar 2017 21:30:15 +0000 (14:30 -0700)]
Add background scan routines and callbacks to broadcast radio HAL.

Bug: b/34054813
Test: existing VTS pass, none added.
Change-Id: I2009e73a9e5edc4752366fd84f67b5a745856441

7 years agoRemove viral readproc group dependency.
Steven Moreland [Wed, 15 Mar 2017 21:08:58 +0000 (14:08 -0700)]
Remove viral readproc group dependency.

This has been copy pasted and isn't actually required.

Test: all hals manually tested to work on internal marlin (which have them binderized).
  Note: tv hals not tested (and they never have been). Filed b/36562029
  Note: for thermal hal, could only run VTS/check logs for errors.
Test: lshal outputs proper stuff
Fixes: 31928447
Change-Id: Id1be584dc0fa2d70e9189b922335146bf6d1382d

7 years agoMerge "Nfc: Null ptr checks in HAL" am: 3b4d423d42 am: 0ee41f6f8c
Ruchi Kandoi [Thu, 23 Mar 2017 19:29:57 +0000 (19:29 +0000)]
Merge "Nfc: Null ptr checks in HAL" am: 3b4d423d42 am: 0ee41f6f8c
am: 87e7c64385

Change-Id: I8706702a3f55ecb6c034e8aa02b3ab4011c2c006

7 years agoMerge "Nfc: Null ptr checks in HAL" am: 3b4d423d42
Ruchi Kandoi [Thu, 23 Mar 2017 19:27:20 +0000 (19:27 +0000)]
Merge "Nfc: Null ptr checks in HAL" am: 3b4d423d42
am: 0ee41f6f8c

Change-Id: Ifc05d12c32e646ceb0f2e810a23d205cdfe7cdc7

7 years agoMerge "Nfc: Null ptr checks in HAL"
Ruchi Kandoi [Thu, 23 Mar 2017 19:24:19 +0000 (19:24 +0000)]
Merge "Nfc: Null ptr checks in HAL"
am: 3b4d423d42

Change-Id: Icede34b74cd253d6921ce38c5abb0d3f80ee1bd7

7 years agoMerge "Nfc: Null ptr checks in HAL"
Treehugger Robot [Thu, 23 Mar 2017 19:20:25 +0000 (19:20 +0000)]
Merge "Nfc: Null ptr checks in HAL"

7 years agoHandle hidl transaction errors in ConfigStore
Pavel Maltsev [Mon, 20 Mar 2017 21:58:59 +0000 (14:58 -0700)]
Handle hidl transaction errors in ConfigStore

Test: surface flinger not failing, android now bootsup

Bug: b/36445794
Change-Id: I22fa7aab9fa92bc04333aaa0eef45891ebeba8e7

7 years agoVerify all radio classes, instead of FM only.
Tomasz Wasilczyk [Tue, 14 Mar 2017 18:19:15 +0000 (11:19 -0700)]
Verify all radio classes, instead of FM only.

Also, a bit of code cleanup.

Bug: b/33382424, b/32022455
Test: VTS
Change-Id: Ib314027b256a6ca4bfa75e9de2ba70990a00b4da

7 years agoMerge "Camera: Add doc for combined stream usage flags"
TreeHugger Robot [Thu, 23 Mar 2017 03:44:35 +0000 (03:44 +0000)]
Merge "Camera: Add doc for combined stream usage flags"

7 years agoremoved unused function (HIDL_FETCH_ISurfaceFlingerConfigs)
Jaesoo Lee [Tue, 21 Mar 2017 06:02:14 +0000 (15:02 +0900)]
removed unused function (HIDL_FETCH_ISurfaceFlingerConfigs)

HIDL_FETCH_... is required only for passthrough mode, but Configstore
does not provide passthrough mode.

Bug: 35325577
Test: build and check configstore works

Change-Id: I35e916ad4a6c321303a3888dabb4884b17146e16
Merged-In: Iac3ed57568f18c3a8a7f7423a361b0fe45aa54ab

7 years agoremoved unused function (HIDL_FETCH_ISurfaceFlingerConfigs)
Jaesoo Lee [Tue, 21 Mar 2017 06:02:14 +0000 (15:02 +0900)]
removed unused function (HIDL_FETCH_ISurfaceFlingerConfigs)

HIDL_FETCH_... is required only for passthrough mode, but Configstore
does not provide passthrough mode.

Bug: 35325577
Test: build and check configstore works
Change-Id: Iac3ed57568f18c3a8a7f7423a361b0fe45aa54ab

7 years agoMerge "Add logic for VHAL versions > 2.0 to forward property information to 2.0 Use...
TreeHugger Robot [Thu, 23 Mar 2017 00:58:36 +0000 (00:58 +0000)]
Merge "Add logic for VHAL versions > 2.0 to forward property information to 2.0 Use this infrastructure to move OBD2_LIVE_FRAME support over to the Vehicle HAL 2.0 layer."

7 years agoMerge "audiohal: Remove stale TODOs"
TreeHugger Robot [Thu, 23 Mar 2017 00:57:15 +0000 (00:57 +0000)]
Merge "audiohal: Remove stale TODOs"

7 years agoMerge "[AWARE] Add Passphrase data-path security" am: 9e71d7d44f am: 5a05398da8
Etan Cohen [Thu, 23 Mar 2017 00:31:04 +0000 (00:31 +0000)]
Merge "[AWARE] Add Passphrase data-path security" am: 9e71d7d44f am: 5a05398da8
am: e3ee58a4e7

Change-Id: I86680b7dc7285658d5b71a8e8bc5fbf504522b96

7 years agoMerge "Bluetooth: Protect pointers and callbacks" am: 54906b6ccf am: ce78f9faab
Myles Watson [Thu, 23 Mar 2017 00:30:50 +0000 (00:30 +0000)]
Merge "Bluetooth: Protect pointers and callbacks" am: 54906b6ccf am: ce78f9faab
am: 4cfd84a049

Change-Id: I6325f5c93c1edd58c7813c5ab7bec9bb8b3f6aef

7 years agoMerge "[AWARE] Add Passphrase data-path security" am: 9e71d7d44f
Etan Cohen [Thu, 23 Mar 2017 00:29:01 +0000 (00:29 +0000)]
Merge "[AWARE] Add Passphrase data-path security" am: 9e71d7d44f
am: 5a05398da8

Change-Id: I5ae40c7077410ad34c3face4aa1fad62dfe5887c

7 years agoMerge "Bluetooth: Protect pointers and callbacks" am: 54906b6ccf
Myles Watson [Thu, 23 Mar 2017 00:28:48 +0000 (00:28 +0000)]
Merge "Bluetooth: Protect pointers and callbacks" am: 54906b6ccf
am: ce78f9faab

Change-Id: I6500b50c6158a2f2d577e223e598748f80d8a0c4

7 years agoMerge "[AWARE] Add Passphrase data-path security"
Etan Cohen [Thu, 23 Mar 2017 00:26:21 +0000 (00:26 +0000)]
Merge "[AWARE] Add Passphrase data-path security"
am: 9e71d7d44f

Change-Id: I4f0e514d2f49156942c6818379347c369c79889b

7 years agoMerge "Bluetooth: Protect pointers and callbacks"
Myles Watson [Thu, 23 Mar 2017 00:26:03 +0000 (00:26 +0000)]
Merge "Bluetooth: Protect pointers and callbacks"
am: 54906b6ccf

Change-Id: Idb2e6f6fc796c95552b112060b9866a81073dc37

7 years agoMerge "[AWARE] Add Passphrase data-path security"
Etan Cohen [Thu, 23 Mar 2017 00:10:33 +0000 (00:10 +0000)]
Merge "[AWARE] Add Passphrase data-path security"

7 years agoMerge "Add manufacturer and model to device ID attestation"
TreeHugger Robot [Thu, 23 Mar 2017 00:01:38 +0000 (00:01 +0000)]
Merge "Add manufacturer and model to device ID attestation"

7 years agoMerge "Bluetooth: Protect pointers and callbacks"
Treehugger Robot [Wed, 22 Mar 2017 23:59:57 +0000 (23:59 +0000)]
Merge "Bluetooth: Protect pointers and callbacks"

7 years agoNfc: Null ptr checks in HAL
Ruchi Kandoi [Mon, 13 Mar 2017 21:58:36 +0000 (14:58 -0700)]
Nfc: Null ptr checks in HAL

Adds null pointer checks in the default implementation.

Test: compiles
Bug: 36149477
Change-Id: I6195ce92f5cefd4b82874866d08014830f400192
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
7 years agoMerge "use toString instead of to_string" am: 6a73f61b96 am: a1b886fd90
Hridya Valsaraju [Wed, 22 Mar 2017 23:04:42 +0000 (23:04 +0000)]
Merge "use toString instead of to_string" am: 6a73f61b96 am: a1b886fd90
am: 35937ab9fa

Change-Id: I0cb0cbff94b206655061c078848c0ff95147fcfc

7 years agoMerge "use toString instead of to_string" am: 6a73f61b96
Hridya Valsaraju [Wed, 22 Mar 2017 23:02:07 +0000 (23:02 +0000)]
Merge "use toString instead of to_string" am: 6a73f61b96
am: a1b886fd90

Change-Id: I5dda7824fcd2988f349a5d1c9df680f9be6700cb

7 years agoMerge "use toString instead of to_string"
Hridya Valsaraju [Wed, 22 Mar 2017 22:59:50 +0000 (22:59 +0000)]
Merge "use toString instead of to_string"
am: 6a73f61b96

Change-Id: Ia28bfdf70b7a79c96822aa3f0402bc0290ad7b3d

7 years agoMerge "use toString instead of to_string"
Treehugger Robot [Wed, 22 Mar 2017 22:49:37 +0000 (22:49 +0000)]
Merge "use toString instead of to_string"

7 years agoMerge "Add VTS for couple of missing APIs and some cleanup for earlier APIs." am...
Sanket Padawe [Wed, 22 Mar 2017 21:44:37 +0000 (21:44 +0000)]
Merge "Add VTS for couple of missing APIs and some cleanup for earlier APIs." am: 60449e68d1 am: 516a71e295
am: 0f8a067a04

Change-Id: Ifbdbf6c739e140eb10c8fafdeaa31b92f281a41b

7 years agoMerge "Add VTS for couple of missing APIs and some cleanup for earlier APIs." am...
Sanket Padawe [Wed, 22 Mar 2017 21:42:01 +0000 (21:42 +0000)]
Merge "Add VTS for couple of missing APIs and some cleanup for earlier APIs." am: 60449e68d1
am: 516a71e295

Change-Id: I55111cddfd5101bfdccc82bdfa07013187d6f95f

7 years agoMerge "Add VTS for couple of missing APIs and some cleanup for earlier APIs."
Sanket Padawe [Wed, 22 Mar 2017 21:39:42 +0000 (21:39 +0000)]
Merge "Add VTS for couple of missing APIs and some cleanup for earlier APIs."
am: 60449e68d1

Change-Id: I0bcc97f30baf408e6eb6b96f7f37b3b536953fc7

7 years agoBluetooth: Protect pointers and callbacks
Myles Watson [Thu, 16 Mar 2017 23:23:23 +0000 (16:23 -0700)]
Bluetooth: Protect pointers and callbacks

Test: kill com.android.bluetooth
Bug: 36150800
Change-Id: I9533731c9ce3776c84e6c1d3fdf3e266b328a084

7 years agoMerge "Add VTS for couple of missing APIs and some cleanup for earlier APIs."
Sanket Padawe [Wed, 22 Mar 2017 21:29:12 +0000 (21:29 +0000)]
Merge "Add VTS for couple of missing APIs and some cleanup for earlier APIs."

7 years agoMerge "Check for unimplemented keymaster function delete_key"
Janis Danisevskis [Wed, 22 Mar 2017 20:46:42 +0000 (20:46 +0000)]
Merge "Check for unimplemented keymaster function delete_key"

7 years agouse toString instead of to_string
Hridya Valsaraju [Fri, 10 Mar 2017 17:19:54 +0000 (09:19 -0800)]
use toString instead of to_string

Bug: 35703683
Test: hidl_test_java passes

Change-Id: Ib7d6807f6b9ddcd7b0271b17a0a52be0ee07ec6c

7 years agoRemove GENERIC_FAILURE and INVALID_ARGUMENT for Api documentation
Shuoq [Mon, 20 Mar 2017 22:51:04 +0000 (15:51 -0700)]
Remove GENERIC_FAILURE and INVALID_ARGUMENT for Api documentation

Remove GENERIC_FAILURE for the documentation of the apis
in the IRadioResponse.hal, which should not be
returned in any case.

Remove INVALID_ARGUMENT for the documentation of the apis
in IRadioResponse.hal if it is not present in the ril.h file.

Bug: 36385785
Test: No change to behavior
Change-Id: Iab0976ddc6b10863cdbdbfb8a8f213d7d9b17cb5

7 years agoMerge "Audio HAL VTS: test leftover calls"
TreeHugger Robot [Wed, 22 Mar 2017 19:25:54 +0000 (19:25 +0000)]
Merge "Audio HAL VTS: test leftover calls"

7 years agoMerge "Create max acquired buffer for framebuffer for SF"
TreeHugger Robot [Wed, 22 Mar 2017 18:51:30 +0000 (18:51 +0000)]
Merge "Create max acquired buffer for framebuffer for SF"

7 years agoCheck for unimplemented keymaster function delete_key
Janis Danisevskis [Wed, 22 Mar 2017 17:28:24 +0000 (10:28 -0700)]
Check for unimplemented keymaster function delete_key

delete_key is optional and may not be implemented by
a legacy hal. So the function pointer must be checked for
nullptr prior to being used.

Bug: 36500704
Test: run VTS tests with legacy hal that does not implement delete_key
Change-Id: Ie51dd173314826ef260319153c7df96d88b8a42f

7 years agoaudiohal: Remove stale TODOs
Mikhail Naganov [Wed, 22 Mar 2017 17:36:14 +0000 (10:36 -0700)]
audiohal: Remove stale TODOs

Bug: 34109709
Change-Id: I9b30ffa2ed06be8cf31cdbfbcc0f4cb0dac7be54
Test: make

7 years agoMerge "disabled passthrough mode for Configstore" am: 7f8b76a322 am: 37b5d80abf
Jaesoo Lee [Wed, 22 Mar 2017 01:07:52 +0000 (01:07 +0000)]
Merge "disabled passthrough mode for Configstore" am: 7f8b76a322 am: 37b5d80abf
am: 7af7140958

Change-Id: I98bb865ed1b5a28a4e57a4da849ef2db685f032c

7 years agoMerge "disabled passthrough mode for Configstore" am: 7f8b76a322
Jaesoo Lee [Wed, 22 Mar 2017 01:05:48 +0000 (01:05 +0000)]
Merge "disabled passthrough mode for Configstore" am: 7f8b76a322
am: 37b5d80abf

Change-Id: I46c7e5876f3def55489ff5103eca8a22bfcd9b6d

7 years agoMerge "disabled passthrough mode for Configstore"
Jaesoo Lee [Wed, 22 Mar 2017 01:04:17 +0000 (01:04 +0000)]
Merge "disabled passthrough mode for Configstore"
am: 7f8b76a322

Change-Id: Ib7e37189c90752d8c536cb2e5bdf0a2518865981

7 years agoMerge "disabled passthrough mode for Configstore"
Jaesoo Lee [Wed, 22 Mar 2017 00:42:32 +0000 (00:42 +0000)]
Merge "disabled passthrough mode for Configstore"

7 years ago[AWARE] Add Passphrase data-path security
Etan Cohen [Tue, 14 Mar 2017 21:54:40 +0000 (14:54 -0700)]
[AWARE] Add Passphrase data-path security

Add mechanism to configure data-path security using Passphrase
(as an alternative to PMK).

Bug: 35866810
Test: integration (sl4a) tests passing.
Change-Id: If7094a44af1996d3caf5b776d492797f14a7be11

7 years agoMerge "audio: fix mistake in AudioDevice enum"
Eric Laurent [Tue, 21 Mar 2017 23:41:08 +0000 (23:41 +0000)]
Merge "audio: fix mistake in AudioDevice enum"

7 years agoMerge "Revert "Make setResponseFunctions() and setCallback() oneway.""
Steven Moreland [Tue, 21 Mar 2017 23:12:16 +0000 (23:12 +0000)]
Merge "Revert "Make setResponseFunctions() and setCallback() oneway.""

7 years agoRevert "Make setResponseFunctions() and setCallback() oneway."
Steven Moreland [Tue, 21 Mar 2017 23:09:44 +0000 (23:09 +0000)]
Revert "Make setResponseFunctions() and setCallback() oneway."

This reverts commit 08b949450e1fa0f90bd530da72e91aa92b5181e8.

Change-Id: Ie2f6c84e1b9264b109b55432be9b77abb82643fd

7 years agoMerge "Make setResponseFunctions() and setCallback() oneway."
Amit Mahajan [Tue, 21 Mar 2017 23:03:47 +0000 (23:03 +0000)]
Merge "Make setResponseFunctions() and setCallback() oneway."

7 years agoCreate max acquired buffer for framebuffer for SF
Fabien Sanglard [Fri, 10 Mar 2017 23:37:07 +0000 (15:37 -0800)]
Create max acquired buffer for framebuffer for SF

Change-Id: I502cfea9e03943c2f2bb353e71cfd860b2797fd5

7 years agoMerge "Revert "Revert "Add useVrFlinger() method to SurfaceFlinger ConfigStore"""
Steven Thomas [Tue, 21 Mar 2017 22:24:52 +0000 (22:24 +0000)]
Merge "Revert "Revert "Add useVrFlinger() method to SurfaceFlinger ConfigStore"""

7 years agoAdd logic for VHAL versions > 2.0 to forward property information to 2.0
Enrico Granata [Tue, 21 Mar 2017 21:26:04 +0000 (14:26 -0700)]
Add logic for VHAL versions > 2.0 to forward property information to 2.0
Use this infrastructure to move OBD2_LIVE_FRAME support over to the Vehicle HAL 2.0 layer.

This is useful in DefaultVehicleHal 2.0 to let the Emulator layer send/receive information about properties defined by later VehicleHal versions.
Additionally, support the notion that a custom property thusly defined might have logic more intricate than simply a property Id and an area Id,
via a custom handler object that supports get() and set() operations. A default handler object simply falls back to a stored VehiclePropValue, but
more complex implementations are possible.

Test: manual testing in Python:
import vhal_consts_2_0 as c
from vhal_emulator import Vhal

v = Vhal(c.vhal_types_2_0)

v.getConfig(c.VEHICLE_PROPERTY_HVAC_TEMPERATURE_SET)
print v.rxMsg()

v.setProperty(c.VEHICLE_PROPERTY_HVAC_TEMPERATURE_SET, c.VEHICLE_ZONE_ROW_1_LEFT, 70)
print v.rxMsg()

v.getProperty(c.VEHICLE_PROPERTY_HVAC_TEMPERATURE_SET, c.VEHICLE_ZONE_ROW_1_LEFT)
print v.rxMsg()

v.getProperty(0x11e00d00, 0)
print v.rxMsg()

plus

runtest Obd2LiveFrame.java

Change-Id: I9c342e6e2c9ff581beacd238a42780ca10f96d9c

7 years agosupplicant(interface): Add an event for bssid changes am: c314841614 am: 995e5b7f13
Roshan Pius [Tue, 21 Mar 2017 22:00:15 +0000 (22:00 +0000)]
supplicant(interface): Add an event for bssid changes am: c314841614 am: 995e5b7f13
am: 74d86aadbb

Change-Id: Idcb780f307f26bcd8edae289e895288d92f3b054