Commit graph

993 commits

Author SHA1 Message Date
Tim Kilbourn
864984c3b1 MouseInputMapper
Maps relative movements of a mouse or scroll wheel and mouse button
presses. All other logic from CursorInputMapper will be handled in the
host.

Change-Id: I00a966a6194d4810b7b6ac5cc815287ecf7dfb84
2015-07-28 13:21:10 -07:00
Alex Klyubin
d79cc6d1b9 am a6ab9737: am f9df59a7: Merge "Add KM_TAG_MIN_MAC_LENGTH." into mnc-dev
* commit 'a6ab97371cdf0361c7ec4c799841e4b8e3eb50cd':
  Add KM_TAG_MIN_MAC_LENGTH.
2015-07-23 20:26:59 +00:00
Shawn Willden
a3f0ab55a7 Add KM_TAG_MIN_MAC_LENGTH.
This allows the binding of minimum length for MACs or tags to HMAC keys
and AEAD symmetric keys.  Later attempts to use these keys with a
shorter MAC or tag specification (provided to begin() with
KM_TAG_MAC_LENGTH) will fail with KM_ERROR_INVALID_MAC_LENGTH.

Bug: 22337277
Change-Id: Ic5292ce01bdd6ecde25aad115e4b407aadc85f23
2015-07-15 10:07:59 -06:00
Sasha Levitskiy
bc4ac88800 am 669288c5: am a36ffbe0: Fingerprint: Add post_enroll() API, adapt struct for binary compatibility, doc change.
* commit '669288c53b0e38a135670827720745d3707a93e6':
  Fingerprint: Add post_enroll() API, adapt struct for binary compatibility, doc change.
2015-07-01 00:18:53 +00:00
Sasha Levitskiy
a36ffbe0bb Fingerprint: Add post_enroll() API, adapt struct for binary compatibility, doc change.
Change-Id: If7e5738f921b0e91e46efc813d9f3c4bd1502832
Signed-off-by: Sasha Levitskiy <sanek@google.com>
2015-06-26 15:10:20 -07:00
Shawn Willden
ca4290b946 am de2c43f8: am 12fff70f: Merge "Revert "Revert "Rename keymaster tag types to clarify that integers are unsigned.""" into mnc-dev
* commit 'de2c43f8847849fc044c92b24f5f4b48391604d5':
  Revert "Revert "Rename keymaster tag types to clarify that integers are unsigned.""
2015-06-25 00:32:09 +00:00
Shawn Willden
12fff70fbd Merge "Revert "Revert "Rename keymaster tag types to clarify that integers are unsigned.""" into mnc-dev 2015-06-24 22:43:58 +00:00
Shawn Willden
29d3e9cf5c am f75c57a8: am f9232031: Merge "Revert "Rename keymaster tag types to clarify that integers are unsigned."" into mnc-dev
* commit 'f75c57a808a70228c7fe8a3bff2f790c9ec2b9f1':
  Revert "Rename keymaster tag types to clarify that integers are unsigned."
2015-06-24 21:31:48 +00:00
Shawn Willden
fbb0dfdf93 am 14fe770e: am 6563afa4: Merge "Rename keymaster tag types to clarify that integers are unsigned." into mnc-dev
* commit '14fe770e2b86a186898b19de53a33d2290978987':
  Rename keymaster tag types to clarify that integers are unsigned.
2015-06-24 21:08:22 +00:00
Shawn Willden
fe6bcfa71d Revert "Revert "Rename keymaster tag types to clarify that integers are unsigned.""
This reverts commit 1fb6c227de.

Change-Id: Iccc8a7ff40a694b1e4420a5de4b847e62289ff42
2015-06-24 20:59:14 +00:00
Shawn Willden
f9232031b2 Merge "Revert "Rename keymaster tag types to clarify that integers are unsigned."" into mnc-dev 2015-06-24 20:53:20 +00:00
Shawn Willden
1fb6c227de Revert "Rename keymaster tag types to clarify that integers are unsigned."
This reverts commit 335920edae.

Change-Id: Ib65f744b93ad2b62d5848dcf743397124a08911b
2015-06-24 20:52:32 +00:00
Shawn Willden
6563afa40b Merge "Rename keymaster tag types to clarify that integers are unsigned." into mnc-dev 2015-06-24 20:28:38 +00:00
Shawn Willden
335920edae Rename keymaster tag types to clarify that integers are unsigned.
Bug: 22008538
Change-Id: I699a0f03aaf0f9f49a78b310763364fc2fb34c90
2015-06-24 13:26:52 -07:00
Andres Morales
eded79189a am 1209f36d: am f8b5a37e: Merge "hardware: gatekeeper: Add delete and delete_all api\'s" into mnc-dev
* commit '1209f36dc51ff5933af4b2b4bea43e928153a4d6':
  hardware: gatekeeper: Add delete and delete_all api's
2015-06-24 18:34:02 +00:00
Andres Morales
f8b5a37ef9 Merge "hardware: gatekeeper: Add delete and delete_all api's" into mnc-dev 2015-06-24 18:06:19 +00:00
Aravind Akella
983c943c81 am 730c0797: am 077d3542: Merge "Define a flag for whether a sensor supports data_injection mode or not." into mnc-dev
* commit '730c0797e5fa8127bd31c4d78a12230cac1d6829':
  Define a flag for whether a sensor supports data_injection mode or not.
2015-06-23 23:18:18 +00:00
Aravind Akella
077d354252 Merge "Define a flag for whether a sensor supports data_injection mode or not." into mnc-dev 2015-06-23 22:24:38 +00:00
Naveen Ramaraj
76b43f9e41 hardware: gatekeeper: Add delete and delete_all api's
Add delete and delete_all api for gatekeeper.

Change-Id: I0511cb546ecba54b2a60692d6f704f24c55aa940
2015-06-23 13:18:52 -07:00
Aravind Akella
c7f54134ca Define a flag for whether a sensor supports data_injection mode or not.
Change-Id: I46373bbd2e10859b84428fe32b76679ac4292607
2015-06-22 18:26:54 -07:00
Shawn Willden
1d4c872c3c am bdea0d2b: am 396d6cbc: Add new error codes for rate-limit and max-use failures.
* commit 'bdea0d2bc30bd2aca568c1135c8d9862e6a1a1d3':
  Add new error codes for rate-limit and max-use failures.
2015-06-19 16:25:00 +00:00
Shawn Willden
1f437b5ee3 am d2584ca4: am 7ac0c0f5: Update comments on now-unsed user ID and app ID tags.
* commit 'd2584ca4e4effc306ed77fed7fe100c728b11d2d':
  Update comments on now-unsed user ID and app ID tags.
2015-06-19 14:11:08 +00:00
Shawn Willden
b9bbb8ebd9 am ddbf941a: am da89dde9: Remove KM_TAG_AEAD_TAG.
* commit 'ddbf941aad84209b9413114171cd8bbd5955a139':
  Remove KM_TAG_AEAD_TAG.
2015-06-19 14:11:07 +00:00
Shawn Willden
396d6cbce9 Add new error codes for rate-limit and max-use failures.
Bug: 21607106
Change-Id: I2e5515efe51b84200ade8c4c4cc5db3800d4b658
2015-06-18 21:20:47 -06:00
Shawn Willden
7ac0c0f5ad Update comments on now-unsed user ID and app ID tags.
I'd just remove them but Trusty keymaster has been generating keys with
KM_TAG_ALL_USERS and KM_TAG_ALL_APPLICATIONS, so removing them without
breaking those keys is tricky.  Plus I think they may come back.

Bug: 21845167
Change-Id: I3b807e3e4bee64eba72b7fa6f1ee1929c4ca9dd0
2015-06-18 12:20:32 -06:00
Shawn Willden
da89dde978 Remove KM_TAG_AEAD_TAG.
Bug: 19919114
Change-Id: I06fdd0f9b8e247587d800031d3367078423baa50
2015-06-18 12:19:03 -06:00
Eino-Ville Talvala
37710d0771 am 1c218f6e: am 8e350b1a: Merge "Camera3: Document behavior of flush() corner cases." into mnc-dev
* commit '1c218f6ec46a7c4ff381ed89edd6d9aa4e93828b':
  Camera3: Document behavior of flush() corner cases.
2015-06-12 23:20:17 +00:00
Eino-Ville Talvala
8e350b1a1d Merge "Camera3: Document behavior of flush() corner cases." into mnc-dev 2015-06-12 22:47:38 +00:00
Sasha Levitskiy
13acd87252 am be94ff37: am d4331fda: Fingerprint: Avoid passing structures where simple types should suffice.
* commit 'be94ff37fda0309ef58d0499b305137dd634ac53':
  Fingerprint: Avoid passing structures where simple types should suffice.
2015-06-11 01:33:28 +00:00
Eino-Ville Talvala
85fdb3ff7d Camera3: Document behavior of flush() corner cases.
Document how HAL should operate when process_capture_request is
called while a flush() call is active.

Bug: 21506384
Change-Id: Ic1842add68123432e49914e83d8f7d5c13d6650d
2015-06-10 14:58:32 -07:00
Sasha Levitskiy
d4331fdae5 Fingerprint: Avoid passing structures where simple types should suffice.
Bug: 21282699

Change-Id: I02e13b7da0ad361a95b981f9745aac039151f356
Signed-off-by: Sasha Levitskiy <sanek@google.com>
2015-06-10 14:10:47 -07:00
Tim Kilbourn
e8ee0c3ee0 Merge "Initial InputMappers for evdev input HAL." 2015-06-10 16:38:44 +00:00
Casper Bonde
5ccdc518ab SAP: Make it possible to enforce a 16-digit pin code (2/5)
This change enable the posibility to enforce using a
16-digit pin or MITM for a RFCOMM or L2CAP connection.

This is needed for the SIM access profile.

Change-Id: I4d43eefa76e8abc1bcfad6dfd9004d8e82168bf4
Signed-off-by: Casper Bonde <c.bonde@samsung.com>
2015-06-09 13:57:53 -07:00
Tim Kilbourn
4f3145d75f Initial InputMappers for evdev input HAL.
The previous design of the InputHost wrapper classes made it very
painful to do testing, so this change also reverts to a more classical
C++ pattern for non-copyable objects. The InputHost classes still simply
call through to the input_host_t and callbacks as before.

Updated unittests to use gmock for mocking the InputHost interactions.

Change-Id: I4b70df2c89ed48af77446b8f5b87a4bde94510bf
2015-06-09 11:16:04 -07:00
Sasha Levitskiy
a70ab95eea Fingerprint: Remove unused API elements.
Change-Id: Iba2f6a5bc7a2923c3e9b92684a2fab2190f14fd5
Signed-off-by: Sasha Levitskiy <sanek@google.com>
2015-06-08 14:00:39 -07:00
Chien-Yu Chen
c88122614c Merge "Camera: Update for torch callbacks" into mnc-dev 2015-06-03 21:02:00 +00:00
Chien-Yu Chen
5c6230ebf6 Camera: Update for torch callbacks
Clarify that HAL shouldn't send AVAILABLE_OFF in addition to
NOT_AVAILABLE when open() is called.

Update the comments to use the right torch status enums.

Bug: 21475390
Change-Id: If9adf4bd169048fc9760ef504d3a36414cfbb196
2015-06-03 13:59:39 -07:00
Dan Stoza
fd2d859445 gralloc: Sort usage flags
Sorts the usage flags in increasing order so it's easier to see where
the gaps are.

Bug: 21609491
Change-Id: I98af3c67be84c6c5137767f3cd7a8bd63dfb5c03
2015-06-03 10:42:38 -07:00
Shawn Willden
7eaa15ffa6 Fix extern "C" guards.
Change-Id: Ibc8e023e3712903dbcbfac5fc64223e32775fe40
2015-06-03 09:03:20 -06:00
Shawn Willden
cbc5834cc7 Merge "Remove KM_TAG_CHUNK_LENGTH and add KM_TAG_AEAD_TAG" into mnc-dev 2015-06-03 05:37:48 +00:00
Shawn Willden
b248e7125b Merge "Fix block mode numbering (CTR got added as 4 rather than 3)" into mnc-dev 2015-06-03 05:30:18 +00:00
Shawn Willden
f291adb593 Merge "Add output params to update() and finish()." into mnc-dev 2015-06-03 05:21:57 +00:00
Casper Bonde
3e4c2dc183 Add support for MITM for BluetoothSockets (3/4)
This change adds an option to enforce Man-in-the-middle protection
for the authentication process. This feature is needed for the Sim
Access Profile.

Change-Id: I35d22a516ecbfc011ed13d7cb7d2ebda047fdfad
Signed-off-by: Casper Bonde <c.bonde@samsung.com>
2015-06-03 03:44:17 +00:00
Chong Zhang
cac8ab8abc Merge "libhardware: fix gralloc usage bit redefine" into mnc-dev 2015-06-03 02:23:31 +00:00
Chong Zhang
2e3ed7e2e7 libhardware: fix gralloc usage bit redefine
bug: 21584171
Change-Id: I66c287681d3e53a263f85fbddfccbb199eaa4b33
2015-06-02 19:00:11 -07:00
Casper Bonde
207331d050 SAP: Change to use new SDP Api (3/4)
Added struct to carry SAP SDP record data.

Change-Id: I511a8de39a6d750e3e94bee72f48b3356ce6cd02
Signed-off-by: Casper Bonde <c.bonde@samsung.com>
2015-06-02 17:00:50 -07:00
Shawn Willden
4144c64818 Remove KM_TAG_CHUNK_LENGTH and add KM_TAG_AEAD_TAG
Bug: 19919114
Change-Id: I384f3d2fee2f68279c6518d9ac0a79e29bed0e52
2015-06-02 09:01:30 -06:00
destradaa
f19ee6b70d Merge "Pack AGpsStatus data structures for 64-bit platforms. b/21471818" into mnc-dev 2015-06-01 21:13:10 +00:00
destradaa
6f8f5c5f40 Pack AGpsStatus data structures for 64-bit platforms.
b/21471818

The packing of AGpsStatus_v1 ensures that its size does not collide with
the size of AGpsStatus_v2.

Change-Id: Ic73a73070c29c0e819cb62667bc14333f448e856
2015-06-01 14:05:51 -07:00
Shawn Willden
4c19a3af35 Fix block mode numbering (CTR got added as 4 rather than 3)
Change-Id: I8c886c67ba081255ef18eb0f99ca1e6003fabb33
2015-06-01 14:52:54 -06:00