Commit graph

2403 commits

Author SHA1 Message Date
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
61809ac218 am e7a11e2d: am a70ab95e: Fingerprint: Remove unused API elements.
* commit 'e7a11e2dd266bea45845fa8ffbcc39d896592f00':
  Fingerprint: Remove unused API elements.
2015-06-09 13:12:00 +00:00
Sasha Levitskiy
e7a11e2dd2 am a70ab95e: Fingerprint: Remove unused API elements.
* commit 'a70ab95eeaf61594594a57e4de957dac47889c96':
  Fingerprint: Remove unused API elements.
2015-06-09 13:01:18 +00: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
8b4e94c664 am 14531c79: am c8812261: Merge "Camera: Update for torch callbacks" into mnc-dev
* commit '14531c790956f234cc1047f0e93b96658651b085':
  Camera: Update for torch callbacks
2015-06-03 22:26:40 +00:00
Dan Stoza
9c2c102072 am e3f11466: am 5e6082fd: Merge "gralloc: Sort usage flags"
* commit 'e3f11466b4be516842e31f99c972128fb3a2aedf':
  gralloc: Sort usage flags
2015-06-03 22:23:20 +00:00
Dan Stoza
1aa65deb49 am 5e244236: am f456512f: Merge "libhardware: fix gralloc usage bit redefine"
* commit '5e2442369add415121b745070c7b611e76ddbbf0':
  libhardware: fix gralloc usage bit redefine
2015-06-03 22:23:19 +00:00
Chien-Yu Chen
14531c7909 am c8812261: Merge "Camera: Update for torch callbacks" into mnc-dev
* commit 'c88122614c1593bc9384564b10f11bd7bb7e3b64':
  Camera: Update for torch callbacks
2015-06-03 21:30:06 +00:00
Tim Kilbourn
3102a68b1a Merge "Configure device classes for evdev devices." 2015-06-03 21:26:09 +00: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
af0a7d5bed am 9845b4d8: am fd2d8594: gralloc: Sort usage flags
* commit '9845b4d8e445d8f2fdbf97cb8883001999ba0b1a':
  gralloc: Sort usage flags
2015-06-03 19:24:13 +00:00
Shawn Willden
26c9c3ad42 am 75b2bc5f: am 7eaa15ff: Fix extern "C" guards.
* commit '75b2bc5fdeec4fbd61bcc0e53bb42d99a2fc287e':
  Fix extern "C" guards.
2015-06-03 19:24:13 +00:00
Dan Stoza
e3f11466b4 am 5e6082fd: Merge "gralloc: Sort usage flags"
* commit '5e6082fd5611771ff9ff2911ed5cdca5d71f06b1':
  gralloc: Sort usage flags
2015-06-03 19:14:54 +00:00
Dan Stoza
5e2442369a am f456512f: Merge "libhardware: fix gralloc usage bit redefine"
* commit 'f456512f9e54c534378683d0cd8f288b6312be2b':
  libhardware: fix gralloc usage bit redefine
2015-06-03 19:14:53 +00:00
Dan Stoza
9845b4d8e4 am fd2d8594: gralloc: Sort usage flags
* commit 'fd2d859445d614ab3f6c4687de839097566ac317':
  gralloc: Sort usage flags
2015-06-03 18:50:10 +00:00
Shawn Willden
75b2bc5fde am 7eaa15ff: Fix extern "C" guards.
* commit '7eaa15ffa65239e8f4f23d21ff1a6ed66ed9a13f':
  Fix extern "C" guards.
2015-06-03 18:46:13 +00:00
Dan Stoza
5e6082fd56 Merge "gralloc: Sort usage flags" 2015-06-03 18:17:47 +00:00
Dan Stoza
f456512f9e Merge "libhardware: fix gralloc usage bit redefine" 2015-06-03 18:17:16 +00:00
Dan Stoza
9181f6da9e 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
(cherry picked from commit fd2d859445)
2015-06-03 11:03:26 -07:00
Chong Zhang
07cc032570 libhardware: fix gralloc usage bit redefine
bug: 21584171
Change-Id: I66c287681d3e53a263f85fbddfccbb199eaa4b33
(cherry picked from commit 2e3ed7e2e7)
2015-06-03 11:02:59 -07:00
Shawn Willden
87192f730f am f7d2d726: am cbc5834c: Merge "Remove KM_TAG_CHUNK_LENGTH and add KM_TAG_AEAD_TAG" into mnc-dev
* commit 'f7d2d7269d588adf20526018f36908287fd1e2d0':
  Remove KM_TAG_CHUNK_LENGTH and add KM_TAG_AEAD_TAG
2015-06-03 17:57:47 +00:00
Shawn Willden
358cc40077 am eb629921: am b248e712: Merge "Fix block mode numbering (CTR got added as 4 rather than 3)" into mnc-dev
* commit 'eb62992159b123574e83a19e9b867a934642000e':
  Fix block mode numbering (CTR got added as 4 rather than 3)
2015-06-03 17:57:46 +00:00
Shawn Willden
8775c434a1 am 7c74d768: am f291adb5: Merge "Add output params to update() and finish()." into mnc-dev
* commit '7c74d7685e6fef1850a4867e7b37a3066cf7ab7d':
  Add output params to update() and finish().
2015-06-03 17:57:45 +00:00
Shawn Willden
f7d2d7269d am cbc5834c: Merge "Remove KM_TAG_CHUNK_LENGTH and add KM_TAG_AEAD_TAG" into mnc-dev
* commit 'cbc5834cc742a66511a586e3001e57378ad361b0':
  Remove KM_TAG_CHUNK_LENGTH and add KM_TAG_AEAD_TAG
2015-06-03 17:45:52 +00:00
Shawn Willden
eb62992159 am b248e712: Merge "Fix block mode numbering (CTR got added as 4 rather than 3)" into mnc-dev
* commit 'b248e7125b6068105242fa26e59be0ac2abdcbef':
  Fix block mode numbering (CTR got added as 4 rather than 3)
2015-06-03 17:45:36 +00:00
Shawn Willden
7c74d7685e am f291adb5: Merge "Add output params to update() and finish()." into mnc-dev
* commit 'f291adb5935545af30c962253234ff5da557cfa8':
  Add output params to update() and finish().
2015-06-03 17:45:35 +00: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
Casper Bonde
2f9c9e3f0d am 87e1fd6d: am 3e4c2dc1: Add support for MITM for BluetoothSockets (3/4)
* commit '87e1fd6d769a5ffbc29631df8ed5b80a8212940b':
  Add support for MITM for BluetoothSockets (3/4)
2015-06-03 17:36:11 +00:00
Chong Zhang
1a2407d9c6 am 898bb872: am cac8ab8a: Merge "libhardware: fix gralloc usage bit redefine" into mnc-dev
* commit '898bb872f35b0ce5a29fbea949ff1a0e6295c4c9':
  libhardware: fix gralloc usage bit redefine
2015-06-03 17:36:05 +00: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
87e1fd6d76 am 3e4c2dc1: Add support for MITM for BluetoothSockets (3/4)
* commit '3e4c2dc18346158235066b54924db708accc63ce':
  Add support for MITM for BluetoothSockets (3/4)
2015-06-03 04:03:55 +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
898bb872f3 am cac8ab8a: Merge "libhardware: fix gralloc usage bit redefine" into mnc-dev
* commit 'cac8ab8abc8e4c3b75cc01efad69ff668ea81f22':
  libhardware: fix gralloc usage bit redefine
2015-06-03 02:44:58 +00:00
Casper Bonde
075e5db03d am 646ce9c7: am 207331d0: SAP: Change to use new SDP Api (3/4)
* commit '646ce9c7b967f1ac61ec7dcd65fa39a76f1090ad':
  SAP: Change to use new SDP Api (3/4)
2015-06-03 02:35:19 +00:00
Chong Zhang
cac8ab8abc Merge "libhardware: fix gralloc usage bit redefine" into mnc-dev 2015-06-03 02:23:31 +00:00
Casper Bonde
646ce9c7b9 am 207331d0: SAP: Change to use new SDP Api (3/4)
* commit '207331d05023ae8226219887c67a26582c1d7068':
  SAP: Change to use new SDP Api (3/4)
2015-06-03 02:22:13 +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
fbd0f9cd6a am e33dcbb8: am f19ee6b7: Merge "Pack AGpsStatus data structures for 64-bit platforms. b/21471818" into mnc-dev
* commit 'e33dcbb876464dcfd6a176e1981fcecb19aa45ba':
  Pack AGpsStatus data structures for 64-bit platforms. b/21471818
2015-06-01 23:42:32 +00:00
destradaa
e33dcbb876 am f19ee6b7: Merge "Pack AGpsStatus data structures for 64-bit platforms. b/21471818" into mnc-dev
* commit 'f19ee6b70df52d535a3ef3321d0e9e2eca560ede':
  Pack AGpsStatus data structures for 64-bit platforms. b/21471818
2015-06-01 23:22:42 +00:00
Tim Kilbourn
3186e7bf48 Configure device classes for evdev devices.
Change-Id: Ia75b71253771d9d558c59411e27f8a51e352fb8b
2015-06-01 14:33:47 -07: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
Shawn Willden
024a15265c Add output params to update() and finish().
Also, change signatures of several methods to pass structs rather than
array pointers and lengths.

Change-Id: Iaa1be186ebbd444202c47926ab57ac65d57416d7
2015-06-01 14:52:54 -06:00