Andre Eisenbach
9a96fe506f
am c9352622
: Merge "Bluetooth native dumpsys logging support (1/5)"
...
* commit 'c93526225f351035c597d6278c2deb3ac32735a2':
Bluetooth native dumpsys logging support (1/5)
2015-06-10 21:12:37 +00:00
Andre Eisenbach
c93526225f
Merge "Bluetooth native dumpsys logging support (1/5)"
2015-06-10 20:19:25 +00:00
Eino-Ville Talvala
966fbc673a
am 17b8cee9
: Merge "Camera2 tests: Update for framework changes" into mnc-dev
...
* commit '17b8cee9a2df698448381d1b03cec2b618c27e97':
Camera2 tests: Update for framework changes
2015-06-09 22:55:09 +00:00
Eino-Ville Talvala
17b8cee9a2
Merge "Camera2 tests: Update for framework changes" into mnc-dev
2015-06-09 22:24:27 +00:00
Eino-Ville Talvala
cd6984e762
Camera2 tests: Update for framework changes
...
Change-Id: I9ac788cfe9a001ef33bdc52a9e8ba0bdcf3ded2c
2015-06-09 15:23:34 -07:00
Casper Bonde
6dd42b5e6b
am 5ccdc518
: SAP: Make it possible to enforce a 16-digit pin code (2/5)
...
* commit '5ccdc518ab33153625536ad31e7c9466511072ab':
SAP: Make it possible to enforce a 16-digit pin code (2/5)
2015-06-09 22:09:36 +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
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
Andre Eisenbach
9a83650cef
Bluetooth native dumpsys logging support (1/5)
...
Bug: 18508263
Change-Id: Id7b69a6ed7d817a0f048cb8ebf0889c600171926
2015-06-08 00:07:51 -07: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
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
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
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
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
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
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
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
Chien-Yu Chen
bdd459ccd9
am bbbcd516
: Merge "Camera3: SHUTTER event for reprocessing" into mnc-dev
...
* commit 'bbbcd516a3b01c288c073ec4fc86ddd9a6115520':
Camera3: SHUTTER event for reprocessing
2015-06-01 18:51:06 +00:00
Dan Stoza
409f47a6fa
am 201c7d91
: gralloc: Add foreign buffer usage flag
...
* commit '201c7d91b757f632bfd67ca24e6c55d0dc88a8d4':
gralloc: Add foreign buffer usage flag
2015-06-01 18:50:34 +00:00
Dan Stoza
c8aa4402e2
am 8a9ae4bd
: Merge "gralloc: Add foreign buffer usage flag"
...
* commit '8a9ae4bd71cf266626f9728d00672f0aa57df895':
gralloc: Add foreign buffer usage flag
2015-06-01 18:43:58 +00:00
Dan Stoza
8a9ae4bd71
Merge "gralloc: Add foreign buffer usage flag"
2015-06-01 18:21:17 +00:00
Dan Stoza
44ddf4208a
gralloc: Add foreign buffer usage flag
...
Adds GRALLOC_USAGE_FOREIGN_BUFFERS, which a consumer may set as a usage
flag if it intends to attach buffers that it has not detached from the
BufferQueue. It provides a hint to the producer (who may query the
consumer usage bits) that it may receive a buffer from another
BufferQueue, so that it can exit during initialization, hopefully with a
meaningful error message, if such buffers are not supported.
Also adds GRALLOC_USAGE_ALLOC_MASK, which is applied to usage bits
before calling alloc on the gralloc module, and prevents the module from
seeing GRALLOC_USAGE_FOREIGN_BUFFERS, since that usage flag is of no use
while allocating buffers.
Bug: 19801661
Change-Id: I17b927de94245f4df7cfd3f4483b544da3e9cd35
(cherry picked from commit 201c7d91b7
)
2015-06-01 11:19:30 -07:00
Chien-Yu Chen
bbbcd516a3
Merge "Camera3: SHUTTER event for reprocessing" into mnc-dev
2015-06-01 17:25:43 +00:00
Chien-Yu Chen
73b49ebbf4
Camera3: SHUTTER event for reprocessing
...
Clarify that the SHUTTER event should be sent when HAL
start processing a reprocess request but the timestamp
should be the input image's start of exposure.
Bug: 21112186
Change-Id: I5bd32b749adc5e82e9a311ec4b123fd807a30d36
2015-06-01 10:21:16 -07:00
Zhijun He
f5c5802c96
am fa216fc2
: Merge "camera3: add camera3 stream configuration mode" into mnc-dev
...
* commit 'fa216fc29d471da3264421024b7a485f05bfe634':
camera3: add camera3 stream configuration mode
2015-05-29 20:51:35 +00:00