Commit graph

1258 commits

Author SHA1 Message Date
Alex Ray
ea80382be1 modules: camera: Update trace headers to libutils
Now that libutils is outside of frameworks, use that for c++-style
scoped tracing and remove the temporary shim header.

Change-Id: I913767aed8ff70abb9299e7a7b318b24a25e23c1
2013-10-14 15:56:43 -07:00
Colin Cross
13a47c5950 am c9940a2b: am b0c30322: hardware: look in /vendor for default.so
* commit 'c9940a2bfe94dbe2ef3bfe5e8692bf4e3cea5ba0':
  hardware: look in /vendor for default.so
2013-10-01 23:10:20 -07:00
Colin Cross
c9940a2bfe am b0c30322: hardware: look in /vendor for default.so
* commit 'b0c303229fcbc89a0afa8f170de64f2a7fee9d6c':
  hardware: look in /vendor for default.so
2013-10-01 22:21:16 -07:00
Colin Cross
b0c303229f hardware: look in /vendor for default.so
Some vendors have their own HAL modules, which may need their
default implementation stored in /vendor.

Change-Id: I5337a61875023404a85029bbc59b984056b3e441
2013-09-30 14:23:01 -07:00
Eino-Ville Talvala
1e7f09eec5 am 9c73c0a2: am 89cfe208: Merge "Camera3: Add PASSIVE_UNFOCUSED AF state and clean up INACTIVE" into klp-dev
* commit '9c73c0a2f2c39cc5e2e1f5d92eaf1fc4b61beb1d':
  Camera3: Add PASSIVE_UNFOCUSED AF state and clean up INACTIVE
2013-09-25 12:34:42 -07:00
Eino-Ville Talvala
9c73c0a2f2 am 89cfe208: Merge "Camera3: Add PASSIVE_UNFOCUSED AF state and clean up INACTIVE" into klp-dev
* commit '89cfe20899d41e1c96efc20e3f203d3f1dba71cd':
  Camera3: Add PASSIVE_UNFOCUSED AF state and clean up INACTIVE
2013-09-25 12:29:27 -07:00
Eino-Ville Talvala
89cfe20899 Merge "Camera3: Add PASSIVE_UNFOCUSED AF state and clean up INACTIVE" into klp-dev 2013-09-25 19:27:54 +00:00
Zhijun He
6b8bbad2d3 am 69716f4b: am 3bf3b45f: Camera2 Test: skip some tests for limited hardware level
* commit '69716f4b1ddc1eb35ac5ef5a528139ed7d20d024':
  Camera2 Test: skip some tests for limited hardware level
2013-09-24 19:31:37 -07:00
Zhijun He
69716f4b1d am 3bf3b45f: Camera2 Test: skip some tests for limited hardware level
* commit '3bf3b45f2d5eb43b74e1a46ff03ed3e2142b1b38':
  Camera2 Test: skip some tests for limited hardware level
2013-09-24 19:29:53 -07:00
Zhijun He
3bf3b45f2d Camera2 Test: skip some tests for limited hardware level
Bug: 10388724
Change-Id: Ifd13f72f1b7ff78cf50dc1c238f17c4b4e90d9b0
2013-09-23 10:13:17 -07:00
Eino-Ville Talvala
4d45d30d4e Camera3: Add PASSIVE_UNFOCUSED AF state and clean up INACTIVE
Needed to support the real case of continuous focus giving up on a
scene for a while (say, a blank wall), during which we shouldn't claim
the lens is in motion.

Also add new states for INACTIVE to clarify it as the starting state
after mode transitions or enabling AF/AE/AWB.

Bug: 10860639
Bug: 10446772

Change-Id: Ie4c1ac73e5a9eb6d1894d83dbded49a2767a8ffd
2013-09-20 18:02:06 -07:00
Zhijun He
d431c70ca7 am 8c81382d: am 60cbb526: Camera2 Test: Fix module and burst test issues
* commit '8c81382d688e617008d2721b0268a17b369a4c1c':
  Camera2 Test: Fix module and burst test issues
2013-09-20 11:21:30 -07:00
Zhijun He
8c81382d68 am 60cbb526: Camera2 Test: Fix module and burst test issues
* commit '60cbb52613d212236de49b4f22fe059585f8c1b2':
  Camera2 Test: Fix module and burst test issues
2013-09-19 21:01:20 -07:00
Zhijun He
60cbb52613 Camera2 Test: Fix module and burst test issues
Bug: 10388724
Change-Id: Idc404cf8a7a96c00941aa8f1880734a236cb3737
2013-09-19 19:01:04 -07:00
Zhijun He
2fe84fcb01 am 8a658946: am b3ac07c0: Camera2 Tests: fix some sanity checks
* commit '8a658946e9eced055d85f31b27921664c5db914f':
  Camera2 Tests: fix some sanity checks
2013-09-17 18:31:52 -07:00
Zhijun He
8a658946e9 am b3ac07c0: Camera2 Tests: fix some sanity checks
* commit 'b3ac07c0028b0afe8f9b009e37af90ec9a697b44':
  Camera2 Tests: fix some sanity checks
2013-09-17 18:29:35 -07:00
Zhijun He
b3ac07c002 Camera2 Tests: fix some sanity checks
Remove the requirement of HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED and make and
fix some minor issues.

Bug: 10388724
Change-Id: I18f0ea60f87902d6c2bbaca53957a91953866c40
2013-09-17 16:53:55 -07:00
Rom Lemarchand
962aa46e60 am 0cd89c8c: am cd996be7: Merge "Initial interface for MemoryTrackerHAL" into klp-dev
* commit '0cd89c8c3619fcc3df3fd14ab74a80c14c34878b':
  Initial interface for MemoryTrackerHAL
2013-09-13 13:27:07 -07:00
Zhijun He
8b95360b20 am 8d24efb0: am 2a512b49: Merge "Camera2 Test: check the right result metadata" into klp-dev
* commit '8d24efb09659e790739f0762fab4e3ce76c5e727':
  Camera2 Test: check the right result metadata
2013-09-13 13:27:07 -07:00
Rom Lemarchand
0cd89c8c36 am cd996be7: Merge "Initial interface for MemoryTrackerHAL" into klp-dev
* commit 'cd996be7791b3f78e925532d5820da06d58cf635':
  Initial interface for MemoryTrackerHAL
2013-09-13 13:20:43 -07:00
Zhijun He
8d24efb096 am 2a512b49: Merge "Camera2 Test: check the right result metadata" into klp-dev
* commit '2a512b49e028b5714782ab69cba9662e01e25016':
  Camera2 Test: check the right result metadata
2013-09-13 13:20:09 -07:00
Rom Lemarchand
cd996be779 Merge "Initial interface for MemoryTrackerHAL" into klp-dev 2013-09-13 18:23:56 +00:00
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