Zhijun He
2a512b49e0
Merge "Camera2 Test: check the right result metadata" into klp-dev
2013-09-13 14:31:07 +00:00
Alex Ray
c94ae1a6fe
am d587c613
: am d9d105a0
: consumer_ir: add array length to get carrier freq
...
* commit 'd587c613c6cdabfac70a6a5e836499bc9d4f8309':
consumer_ir: add array length to get carrier freq
2013-09-12 09:21:59 -07:00
Alex Ray
d587c613c6
am d9d105a0
: consumer_ir: add array length to get carrier freq
...
* commit 'd9d105a0ce6bbaa8d1d1cf70a255612a5dd33701':
consumer_ir: add array length to get carrier freq
2013-09-12 09:12:47 -07:00
Zhijun He
914226ce76
Camera2 Test: check the right result metadata
...
We need check the right result metadata by looking for the right request id.
Bug: 10710768
Change-Id: I1e946f82e569fa6afc5067552c3f850ffffbf698
2013-09-12 02:45:12 -07:00
Alex Ray
d9d105a0ce
consumer_ir: add array length to get carrier freq
...
Change-Id: Iefb424db6f16ffefa40da56c765c9b7a24bea397
2013-09-11 17:51:19 -07:00
Kenny Root
7292184482
am 0b4b67c4
: am 1d640f05
: Merge "Use canonical UniquePtr.h header"
...
* commit '0b4b67c488f68b6d359972098fc44e3126d1f426':
Use canonical UniquePtr.h header
2013-09-11 17:24:09 -07:00
Alex Ray
1b13c38efa
am ddc0748f
: am c900b423
: Merge "consumerir: make transmit array constant" into klp-dev
...
* commit 'ddc0748f30ed06b09759622df994d4952eb8df4b':
consumerir: make transmit array constant
2013-09-11 17:23:39 -07:00
Glenn Kasten
e17899314b
am 063c87f2
: am 22b42bc5
: Merge "Clarify return values of get_presentation_position" into klp-dev
...
* commit '063c87f2b96d6a2914dc57f7e7b9b4541de71dbc':
Clarify return values of get_presentation_position
2013-09-11 17:23:10 -07:00
Kenny Root
0b4b67c488
am 1d640f05
: Merge "Use canonical UniquePtr.h header"
...
* commit '1d640f05dcedfcaae63eeb90f3d89b16e95d0208':
Use canonical UniquePtr.h header
2013-09-11 14:56:06 -07:00
Kenny Root
1d640f05dc
Merge "Use canonical UniquePtr.h header"
2013-09-11 21:52:15 +00:00
Kenny Root
a4cef69367
Use canonical UniquePtr.h header
...
Change-Id: I0487bd53fc946e1a488d7109eebd402d1ecc5a0a
2013-09-11 14:51:09 -07:00
Alex Ray
ddc0748f30
am c900b423
: Merge "consumerir: make transmit array constant" into klp-dev
...
* commit 'c900b4230c5f33abc1b7bc590c4ffe21ec8a59d0':
consumerir: make transmit array constant
2013-09-11 13:49:29 -07:00
Alex Ray
c900b4230c
Merge "consumerir: make transmit array constant" into klp-dev
2013-09-11 20:45:03 +00:00
Alex Ray
6670e24966
consumerir: make transmit array constant
...
Change-Id: I0409970d7bd8efe69a69ec038eea4ee3ff9cbfe0
2013-09-11 13:36:58 -07:00
Glenn Kasten
063c87f2b9
am 22b42bc5
: Merge "Clarify return values of get_presentation_position" into klp-dev
...
* commit '22b42bc528c1a38176572c128323e945ea4a7d0a':
Clarify return values of get_presentation_position
2013-09-11 12:33:30 -07:00
Glenn Kasten
22b42bc528
Merge "Clarify return values of get_presentation_position" into klp-dev
2013-09-11 19:31:27 +00:00
Alex Ray
7e4ba5a528
am 8473b305
: am 09875a2e
: modules: add demo consumer IR HAL
...
* commit '8473b3056da8d2ac85c1790feb7e6675a7148bcd':
modules: add demo consumer IR HAL
2013-09-10 12:58:33 -07:00
Alex Ray
657aa6a048
am 1e3073bf
: am fe46e6a9
: libhardware: add Consumer IR HAL API
...
* commit '1e3073bf08962db3a7292e0a324084eb386b5521':
libhardware: add Consumer IR HAL API
2013-09-10 12:58:32 -07:00
Alex Ray
8473b3056d
am 09875a2e
: modules: add demo consumer IR HAL
...
* commit '09875a2eabe6bc6582b40ab8f1cc9eac9c3901d5':
modules: add demo consumer IR HAL
2013-09-10 12:54:16 -07:00
Alex Ray
1e3073bf08
am fe46e6a9
: libhardware: add Consumer IR HAL API
...
* commit 'fe46e6a90675fc637a1482e8dfeb27e374b7600d':
libhardware: add Consumer IR HAL API
2013-09-10 12:54:16 -07:00
Kenny Root
042c7bb780
am 9c83f1d8
: am 6a09617e
: Merge "keymaster: use new version fields in hw_module"
...
* commit '9c83f1d8075f701ce6c1686cb6d79cc6605f9d4d':
keymaster: use new version fields in hw_module
2013-09-10 11:20:40 -07:00
Kenny Root
9c83f1d807
am 6a09617e
: Merge "keymaster: use new version fields in hw_module"
...
* commit '6a09617eaa2e47e768b87c341459bf80e008a359':
keymaster: use new version fields in hw_module
2013-09-10 11:18:11 -07:00
Kenny Root
6a09617eaa
Merge "keymaster: use new version fields in hw_module"
2013-09-10 18:14:58 +00:00
Kenny Root
36ab8ed76f
keymaster: use new version fields in hw_module
...
The original version of this HAL used a field in keymaster_module to
represent the module's version number, but a later revision of the HAL
interface added a distinguisher between HAL module and device versions.
This is needed to support upgrade code in keystore.
(cherry picked from commit c124b23f94
)
Bug: 10600582
Change-Id: Ia2b0cbeca5c507600228c39ec7a8402f819f8804
2013-09-10 18:14:49 +00:00
Glenn Kasten
22a06b752f
Clarify return values of get_presentation_position
...
Change-Id: I495d7abd7e366849308c66bcaee99554dcd244aa
2013-09-10 09:23:48 -07:00
Alex Ray
09875a2eab
modules: add demo consumer IR HAL
...
Change-Id: Iaae40c06af0dc008429d5dee4f45dc0b156957a1
2013-09-09 23:55:26 -07:00
Alex Ray
fe46e6a906
libhardware: add Consumer IR HAL API
...
Change-Id: I68db7911784aa802b378a5e1dad62397da16b03b
2013-09-09 23:52:49 -07:00
Colin Cross
aa773500a4
Initial interface for MemoryTrackerHAL
...
Bug: 10294768
Change-Id: I65cb28c8f77f3dafe5b47b24479c647fa72fc65f
2013-09-09 13:54:33 -07:00
Zhijun He
7940619636
am 32bf9c8e
: am eb485256
: Merge "Camera2 Tests: Fix stream id types" into klp-dev
...
* commit '32bf9c8ecc682ddd00b915554bb15182086b4af4':
Camera2 Tests: Fix stream id types
2013-09-09 11:32:59 -07:00
Zhijun He
32bf9c8ecc
am eb485256
: Merge "Camera2 Tests: Fix stream id types" into klp-dev
...
* commit 'eb485256e99e97653773024951568aadcc60f6a4':
Camera2 Tests: Fix stream id types
2013-09-09 11:31:28 -07:00
Zhijun He
eb485256e9
Merge "Camera2 Tests: Fix stream id types" into klp-dev
2013-09-09 18:28:12 +00:00
Alex Ray
506c869ee7
am 8e3c71de
: am 51dbad3b
: Merge "hardware: camera_common: add module vendor tag ops" into klp-dev
...
* commit '8e3c71ded215a95ee2e8e6cbbe9ac5a65ad528a1':
hardware: camera_common: add module vendor tag ops
2013-09-09 10:38:04 -07:00
Alex Ray
8e3c71ded2
am 51dbad3b
: Merge "hardware: camera_common: add module vendor tag ops" into klp-dev
...
* commit '51dbad3bfa313a4ba9219e3d9c4b3c1b2a15d52f':
hardware: camera_common: add module vendor tag ops
2013-09-09 10:34:33 -07:00
Alex Ray
51dbad3bfa
Merge "hardware: camera_common: add module vendor tag ops" into klp-dev
2013-09-09 17:29:14 +00:00
Alex Ray
19b2ceafe4
hardware: camera_common: add module vendor tag ops
...
This updates the camera module API to have vendor-specific tag support.
Vendor-specific metadata tags could be contained in static camera
characteristics, so we need a method of accessing vendor tag information
from the module level (and not just with a device open).
Bug: 10612133
Change-Id: I28e8c769f8112ff4f745f3f1b5472e8a718f1356
2013-09-06 17:46:15 -07:00
Zhijun He
a159417389
Camera2 Tests: Fix stream id types
...
Bug: 10604704
Change-Id: I5edddb1011d6744225c59f44bd6df8ae4234d336
2013-09-06 15:35:09 -07:00
Kenny Root
4223cc3cdf
am 474cbcbb
: am c124b23f
: keymaster: use new version fields in hw_module
...
* commit '474cbcbb2ed5bebcd2c5f45cbba6a163e9265742':
keymaster: use new version fields in hw_module
2013-09-05 00:32:39 -07:00
Kenny Root
474cbcbb2e
am c124b23f
: keymaster: use new version fields in hw_module
...
* commit 'c124b23f94a0a88e872253720c0e27594a9a9938':
keymaster: use new version fields in hw_module
2013-09-05 00:30:25 -07:00
Kenny Root
c124b23f94
keymaster: use new version fields in hw_module
...
The original version of this HAL used a field in keymaster_module to
represent the module's version number, but a later revision of the HAL
interface added a distinguisher between HAL module and device versions.
This is needed to support upgrade code in keystore.
Bug: 10600582
Change-Id: Ied34cf382e2b7725e648faada00df2dee993e6c5
2013-09-04 22:17:56 -07:00
Kenny Root
5e1508b88f
am 76b73a39
: am 2541a0a8
: Add support for DSA and ECDSA key types
...
* commit '76b73a39e39f1dd965d2ed685bbdf36403e0356a':
Add support for DSA and ECDSA key types
2013-09-03 10:34:46 -07:00
Kenny Root
76b73a39e3
am 2541a0a8
: Add support for DSA and ECDSA key types
...
* commit '2541a0a8f7a2c86658d435efb49843a88b4d97e0':
Add support for DSA and ECDSA key types
2013-09-03 10:32:05 -07:00
Kenny Root
2541a0a8f7
Add support for DSA and ECDSA key types
...
(cherry picked from commit 6e1683f5d5
)
Bug: 10600582
Change-Id: I8e5b66baa70b37031198260853bb5355df75e23d
2013-09-03 00:52:48 -07:00
Kenny Root
886578b323
am a928d816
: am bd5015e0
: Merge "Add support for DSA and ECDSA key types"
...
* commit 'a928d816a4a7410cd18f114f6d0ad1837e07bdd2':
Add support for DSA and ECDSA key types
2013-09-03 00:16:54 -07:00
Kenny Root
a928d816a4
am bd5015e0
: Merge "Add support for DSA and ECDSA key types"
...
* commit 'bd5015e0f3b79d8b8e7f9b1926bbf76985ac8c61':
Add support for DSA and ECDSA key types
2013-09-03 00:14:20 -07:00
Kenny Root
bd5015e0f3
Merge "Add support for DSA and ECDSA key types"
2013-09-03 07:11:08 +00:00
Kenny Root
6e1683f5d5
Add support for DSA and ECDSA key types
...
Change-Id: I4b7d11c0915c716a0f1be65f5933f33a36e0fb4b
2013-09-03 00:09:18 -07:00
Glenn Kasten
1c06c82f19
am 5dae225d
: Merge "get_presentation_position" into klp-dev
...
* commit '5dae225de7b5ccf965d1496bc4343828a250f788':
get_presentation_position
2013-08-29 17:08:09 -07:00
Glenn Kasten
5dae225de7
Merge "get_presentation_position" into klp-dev
2013-08-30 00:02:57 +00:00
jpadmana
45e6939f7d
am 935799d6
: Addition of EFFECT_CMD_OFFLOAD for effects offload
...
* commit '935799d63f0d654f350a640001077616572a4b63':
Addition of EFFECT_CMD_OFFLOAD for effects offload
2013-08-29 14:09:31 -07:00
Glenn Kasten
e25f9ed346
get_presentation_position
...
Change-Id: Iedc4df9018321d7273eaa862e913ad6d9a844618
2013-08-29 12:05:12 -07:00