Commit graph

1586 commits

Author SHA1 Message Date
Colin Cross
23e41654e2 am 6c8ad5aa: am 80d4eced: Merge "Use /(vendor|system)/lib64/hw for 64-bit HAL libraries"
* commit '6c8ad5aa80a12c5a76cf22d5b87097ee5d950c62':
  Use /(vendor|system)/lib64/hw for 64-bit HAL libraries
2014-02-16 18:47:57 +00:00
Colin Cross
6c8ad5aa80 am 80d4eced: Merge "Use /(vendor|system)/lib64/hw for 64-bit HAL libraries"
* commit '80d4eced69f4d1e9f9ef97b5f4f26868cd76ae26':
  Use /(vendor|system)/lib64/hw for 64-bit HAL libraries
2014-02-16 18:42:54 +00:00
Colin Cross
80d4eced69 Merge "Use /(vendor|system)/lib64/hw for 64-bit HAL libraries" 2014-02-16 18:40:01 +00:00
Dan Willemsen
86389d1080 Use /(vendor|system)/lib64/hw for 64-bit HAL libraries
Change-Id: Ib905e079b1e88977fb3408671301904c58f35d3c
2014-02-16 10:07:15 -08:00
David Turner
8ef59807d4 am b1d5760b: am f77bd7d0: Merge "Try using goldfish_pipe as the device name"
* commit 'b1d5760b08c0116f3e5cf33e21a4ff710cd3d7a4':
  Try using goldfish_pipe as the device name
2014-02-14 17:35:53 +00:00
David Turner
b1d5760b08 am f77bd7d0: Merge "Try using goldfish_pipe as the device name"
* commit 'f77bd7d005e27364e233c92ac7f6c06a18d1f128':
  Try using goldfish_pipe as the device name
2014-02-14 17:27:21 +00:00
David Turner
f77bd7d005 Merge "Try using goldfish_pipe as the device name" 2014-02-14 16:34:25 +00:00
Greg Hackmann
178f0503d5 am f6d2142d: am f4c46752: Merge "AArch64: Calculate private_handle_t\'s numInts"
* commit 'f6d2142d93063a02b1eab75f8f46b172da772f6b':
  AArch64: Calculate private_handle_t's numInts
2014-02-13 20:52:18 +00:00
Greg Hackmann
f6d2142d93 am f4c46752: Merge "AArch64: Calculate private_handle_t\'s numInts"
* commit 'f4c46752df57be558773a056d6545877ef65c844':
  AArch64: Calculate private_handle_t's numInts
2014-02-13 20:46:21 +00:00
Greg Hackmann
f4c46752df Merge "AArch64: Calculate private_handle_t's numInts" 2014-02-13 20:41:18 +00:00
Eino-Ville Talvala
d3dead483c Merge "camera3: Docs updates to line up with metadata changes" 2014-02-11 17:53:40 +00:00
Eino-Ville Talvala
c5bff0d955 camera3: Docs updates to line up with metadata changes
Change-Id: I3065c9f1d905a4e7d0bb6eef2b4556c81a0788fe
2014-02-10 16:43:26 -08:00
Zhijun He
06da1b3745 camera3: fix typo in camera open KPI
Change-Id: Ieefdc5a0f5159a3053e141075e71d268499746ed
2014-02-10 16:04:23 -08:00
Simon Wilson
bda5e3f226 am 7ad4534e: am 907b20aa: Initial version of the MCU HAL
* commit '7ad4534e1ee6ec9744392d23199049c16ed18159':
  Initial version of the MCU HAL
2014-02-10 20:44:38 +00:00
Simon Wilson
7ad4534e1e am 907b20aa: Initial version of the MCU HAL
* commit '907b20aa7475a91a148bb655b0d80cecabb130f6':
  Initial version of the MCU HAL
2014-02-10 20:38:51 +00:00
Simon Wilson
907b20aa74 Initial version of the MCU HAL
Change-Id: Ic88da7e825b67ed64cde4eed3055022daabe9830
2014-02-07 18:07:39 -08:00
Zhijun He
ceac9e3651 camera3: Add input buffer field in capture result
For HAL3.2 or above, the HAL must return the input buffer in capture result
rather than capture request.

Change-Id: I0108cda1cdf51556d7273b2c3cfbaf0e6ecd1d76
2014-02-07 14:47:25 -08:00
Ashok Bhat
d2be74aa57 AArch64: Calculate private_handle_t's numInts
A constant sNumInts with a value of 6 was being assigned to the numInts
attribute in the private_handle_t constructor, and was also used in the
validate method. That constant value is appropriate for 32-bit systems
but is not appropriate for a 64-bit system where uintptr_t used for
base attribute will be 64-bit.

sNumInts is now changed to a static inline function that calculates
numInts.

Change-Id: I482ddb5915c9ff55fb2e2a87887a0ec2dc2299ed
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
2014-02-07 17:52:08 +00:00
Zhijun He
46c28a4638 Merge "camera3: update BIDIRECTIONAL and INPUT stream specs" 2014-02-06 19:03:01 +00:00
Colin Cross
d39b2a8a98 am 5dbc98ff: am 037335eb: Merge "gralloc: fix warnings"
* commit '5dbc98ff2c6714d66a1377ed9c9030d130ed7ebb':
  gralloc: fix warnings
2014-02-06 03:11:39 +00:00
Colin Cross
5dbc98ff2c am 037335eb: Merge "gralloc: fix warnings"
* commit '037335ebe826289445fd2ba14e95ff41d57ad928':
  gralloc: fix warnings
2014-02-06 03:03:12 +00:00
Colin Cross
037335ebe8 Merge "gralloc: fix warnings" 2014-02-06 02:25:32 +00:00
Colin Cross
febaaa937f gralloc: fix warnings
Fix LP64 pointer casting warnings, unused parameters, and
turn off missing initializer warnings.

Change-Id: Idb70f4534282fed64ae81cb1e154d3f5b93091b0
2014-02-05 18:21:09 -08:00
Zhijun He
bc35868a6f camera3: update BIDIRECTIONAL and INPUT stream specs
Also add the manual template to the version history.

Change-Id: I0a516ccbbd3600d69217502e19b267e2d3aa60e8
2014-02-04 17:05:56 -08:00
Ruben Brunk
093e8e8b9b Merge "camera3: Update maxRegions tag." 2014-02-04 21:00:59 +00:00
Ruben Brunk
80df5b529f camera3: Update maxRegions tag.
Change-Id: I22501cbf7f941d9626b88182e2dda8a13a620d01
2014-02-03 17:40:43 -08:00
Glenn Kasten
0ab9c38fc9 Merge "usbaudio: fix for out->dev->lock remains locked in error case" 2014-02-04 01:20:26 +00:00
Zhijun He
06c72f6bd7 Merge "camera3: Update flush HAL API spec" 2014-02-04 01:04:16 +00:00
Zhijun He
2020ee299c camera3: Add camera close KPI
Change-Id: I265750ade49c63beedd3d9d0f2b8e7b3d19cc38f
2014-02-03 13:21:13 -08:00
Zhijun He
5a5fbf489e camera3: Update flush HAL API spec
Change-Id: I4e36dcc4445c2fae71fe4ce22a0f3b9a28abe1c0
2014-02-03 13:04:05 -08:00
Sharvil Nanavati
0932359d5b Fix PAN control callback definition to match what bluedroid is doing.
There's a discrepancy in the order of arguments between the interface
and the implementation. bluedroid swaps the |error| and |local_role|
arguments when calling back so this change redefines the interface
for consistency.

http://b/12853951

Change-Id: I0ccfc6d6d2002d647d484ab7f53744863b569502
2014-02-01 16:39:50 -08:00
Amit Shekhar
f9953b7d52 usbaudio: fix for out->dev->lock remains locked in error case
out->dev->lock remains locked in error case in out_write()
Added pthread_mutex_unlock() in the error case

Bug: 12824374
Change-Id: Ibbbd5ced1f9d469cfba3b33a94414d0b94affa8f
Signed-off-by: Glenn Kasten <gkasten@google.com>
2014-01-30 16:23:21 -08:00
Octavian Purdila
d3d041b7d1 Try using goldfish_pipe as the device name
The upstream goldfish_pipe driver uses goldfish_pipe as a name instead
of qemu_pipe. Try using this name if the old name (qemu_pipe) fails.

For: ABIT-15
Change-Id: I8c6178faf27b1cdb31cc4343cf1af396e929f7e4
Signed-off-by: Octavian Purdila <octavian.purdila@intel.com>
Signed-off-by: Jun Tian <jun.j.tian@intel.com>
2014-01-29 18:03:04 +08:00
Colin Cross
0ab48411fe am 8ded7780: am 3da0d0f4: am 662e97ee: am aea8c156: Merge "hardware/libhardware: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH"
* commit '8ded7780c6658d6db011f642206726234098388f':
  hardware/libhardware: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH
2014-01-28 01:08:45 +00:00
Colin Cross
8ded7780c6 am 3da0d0f4: am 662e97ee: am aea8c156: Merge "hardware/libhardware: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH"
* commit '3da0d0f4c7a02cbb510d65def4e87eb31c97948b':
  hardware/libhardware: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH
2014-01-28 01:03:07 +00:00
Colin Cross
3da0d0f4c7 am 662e97ee: am aea8c156: Merge "hardware/libhardware: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH"
* commit '662e97eedbb36374e61dab50a7acb4b2bae29883':
  hardware/libhardware: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH
2014-01-28 00:58:41 +00:00
Colin Cross
662e97eedb am aea8c156: Merge "hardware/libhardware: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH"
* commit 'aea8c156649c16347514741eb084858cdb458b75':
  hardware/libhardware: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH
2014-01-28 00:51:42 +00:00
Colin Cross
aea8c15664 Merge "hardware/libhardware: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH" 2014-01-28 00:42:39 +00:00
Colin Cross
3557abaae2 hardware/libhardware: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH
LOCAL_MODULE_PATH doesn't work for multiarch builds, replace it
with LOCAL_MODULE_RELATIVE_PATH.

Change-Id: I4e4ceec61d026bbe74ba604554c06104bde42e5e
2014-01-24 21:00:32 -08:00
David 'Digit' Turner
8690233d7a am ae2e54fa: resolved conflicts for merge of 017649d6 to klp-modular-dev
* commit 'ae2e54faf71f4ff3d96216031c66d14dfbbceb5f':
  Vibra: Adapt AOSP (default) vibrator HAL into a hardware module.
2014-01-23 23:26:23 +00:00
David 'Digit' Turner
ae2e54faf7 resolved conflicts for merge of 017649d6 to klp-modular-dev
Conflicts:
	modules/Android.mk

Change-Id: I6b84d2320be98b6af1f0cab729a917cf84cd9524
2014-01-23 23:34:45 +01:00
David Turner
017649d62c am c2f6dc45: am fa3d243b: Merge "Vibra: Adapt AOSP (default) vibrator HAL into a hardware module."
* commit 'c2f6dc45643bd2b6251362ca4bc814d6601358d2':
  Vibra: Adapt AOSP (default) vibrator HAL into a hardware module.
2014-01-23 20:29:23 +00:00
David Turner
c2f6dc4564 am fa3d243b: Merge "Vibra: Adapt AOSP (default) vibrator HAL into a hardware module."
* commit 'fa3d243b4690f2cc21d259e52178abf969cafc09':
  Vibra: Adapt AOSP (default) vibrator HAL into a hardware module.
2014-01-23 12:20:28 -08:00
David Turner
fa3d243b46 Merge "Vibra: Adapt AOSP (default) vibrator HAL into a hardware module." 2014-01-23 20:13:03 +00:00
Igor Murashkin
5df2f622b9 camera3: Add partial result processing in HAL3.2
Change-Id: I665cf1191a1c7510671b3c171b47c167530c1067
2014-01-17 18:26:59 -08:00
Igor Murashkin
78aa126e23 camera3: deprecate register_stream_buffers in hal 3.2
Change-Id: I7efabcba9b47846e831ffdf75ba1ea3c7e5ff629
2014-01-17 17:05:11 -08:00
Zhijun He
709e5878b8 camera3: wording fix for KPI
Change-Id: I4172fcdda3452eced663e332d509dea2594c1710
2014-01-17 15:25:21 -08:00
Zhijun He
2dde4685c2 Camera3: Add performance KPI requirement
Change-Id: I2133736b9e00b170200308982e591f311e1f04f7
2014-01-17 15:17:40 -08:00
Ruben Brunk
b35bee2a90 Fix build. Missing vendor tags header. 2014-01-17 14:48:19 -08:00
Ruben Brunk
61cf9eb920 camera3: Update vendor tag spec for HAL 3.2.
- Deprecates vendor tag specification in camera3 device.
- Moves vendor tag ops declaration to camera metadata library and
  cleans up definitions.
- Updates the example HAL.

Change-Id: Ifb16bb0d4bbc896bc32d33dd150e7e174af57dad
2014-01-16 18:27:08 -08:00