OSDN Git Service

android-x86/hardware-libhardware.git
10 years agomodules: camera: replace pthread mutex with utils'
Alex Ray [Tue, 12 Nov 2013 20:58:39 +0000 (12:58 -0800)]
modules: camera: replace pthread mutex with utils'

Change-Id: Id974e4cc743d27d59634023cfdbba545fbb64e5f

10 years agoFix typo in the Supl interface name
destradaa [Thu, 7 Nov 2013 21:47:59 +0000 (13:47 -0800)]
Fix typo in the Supl interface name

Change-Id: I37b928f2da4fc6b6947bba87269ac7ee09f8bbcc

10 years agoam 15f0d47d: am af822c43: Merge "gralloc: do not use GNU old-style field designators"
Nick Kralevich [Thu, 7 Nov 2013 03:42:41 +0000 (19:42 -0800)]
am 15f0d47d: am af822c43: Merge "gralloc: do not use GNU old-style field designators"

* commit '15f0d47dc6611150be34bc98a8f328df53c93397':
  gralloc: do not use GNU old-style field designators

10 years agoam af822c43: Merge "gralloc: do not use GNU old-style field designators"
Nick Kralevich [Thu, 7 Nov 2013 03:40:57 +0000 (19:40 -0800)]
am af822c43: Merge "gralloc: do not use GNU old-style field designators"

* commit 'af822c43cf144a991db49d8c25068d054265ae37':
  gralloc: do not use GNU old-style field designators

10 years agoMerge "gralloc: do not use GNU old-style field designators"
Nick Kralevich [Thu, 7 Nov 2013 03:34:27 +0000 (03:34 +0000)]
Merge "gralloc: do not use GNU old-style field designators"

10 years agogralloc: do not use GNU old-style field designators
synergy dev [Thu, 7 Nov 2013 01:27:44 +0000 (17:27 -0800)]
gralloc: do not use GNU old-style field designators

Avoiding the use of gnu extensions improves code portability

Change-Id: Icf8e3d4813bcddff40548bb5e65e615f8697b75c

10 years agoMerge "modules: camera: Metadata refactor"
Alex Ray [Thu, 31 Oct 2013 17:15:27 +0000 (17:15 +0000)]
Merge "modules: camera: Metadata refactor"

10 years agoam fc2a7951: am b44ff650: Camera2 Test: Skip CameraModuleTest for HAL V1 devices
Zhijun He [Wed, 30 Oct 2013 01:39:53 +0000 (18:39 -0700)]
am fc2a7951: am b44ff650: Camera2 Test: Skip CameraModuleTest for HAL V1 devices

* commit 'fc2a7951518b4d39ea88b599ba37cc9ec57418dd':
  Camera2 Test: Skip CameraModuleTest for HAL V1 devices

10 years agoam b44ff650: Camera2 Test: Skip CameraModuleTest for HAL V1 devices
Zhijun He [Wed, 30 Oct 2013 01:37:02 +0000 (18:37 -0700)]
am b44ff650: Camera2 Test: Skip CameraModuleTest for HAL V1 devices

* commit 'b44ff6508bbcb8df751b5815dd4dfbd4cae252f7':
  Camera2 Test: Skip CameraModuleTest for HAL V1 devices

10 years agoCamera2 Test: Skip CameraModuleTest for HAL V1 devices
Zhijun He [Mon, 28 Oct 2013 22:52:56 +0000 (15:52 -0700)]
Camera2 Test: Skip CameraModuleTest for HAL V1 devices

Bug: 10971907
Change-Id: Ia3aa0e370d7eb5de6bb1fb7ff48a71ea5605fa17

10 years agomodules: camera: Metadata refactor
Alex Ray [Mon, 21 Oct 2013 19:55:24 +0000 (12:55 -0700)]
modules: camera: Metadata refactor

Add* functions const to protect data being added.
Initiailze metadata object from a camera_metadata_t.
Remove template-specific constructor.
Add convenience "add1" method to abvoid stack-allocated data.
Construct templates manually (in ExampleCamera) from base.

Change-Id: I3201f61e9d32841ea7a769d69242b40d8727c02e

10 years agoAdd new HAL for programable NFC tags
Benoit Goby [Fri, 11 Oct 2013 00:39:24 +0000 (17:39 -0700)]
Add new HAL for programable NFC tags

Change-Id: Ia904cae0ac371650c96cef1d13ab811889620092

10 years agomodules: camera: dump device and stream state
Alex Ray [Mon, 21 Oct 2013 07:46:44 +0000 (00:46 -0700)]
modules: camera: dump device and stream state

Change-Id: Iae3badba71f13784dfdd65d6e77b20283437935a

10 years agomodules: camera: add vendor tag functionality
Alex Ray [Fri, 18 Oct 2013 04:52:03 +0000 (21:52 -0700)]
modules: camera: add vendor tag functionality

Vendor Tag operations were added in module api v2.2

Change-Id: I352a50759d8bb9389d904bb774659e4be883794b

10 years agomodules: camera: Abstract device-specific camera
Alex Ray [Thu, 4 Jul 2013 00:54:19 +0000 (17:54 -0700)]
modules: camera: Abstract device-specific camera

ExampleCamera represents a specific (e.g. front or back) camera device,
and contains all the device and logic for that device/sensor.

Change-Id: Iecc1a1d905501a66edb6e3994ff93d8761b82f8b

10 years agoMerge "modules: camera: Add android.jpeg.maxSize metadata"
Alex Ray [Thu, 17 Oct 2013 21:40:32 +0000 (21:40 +0000)]
Merge "modules: camera: Add android.jpeg.maxSize metadata"

10 years agoMerge "modules: camera: Update trace headers to libutils"
Alex Ray [Thu, 17 Oct 2013 21:40:07 +0000 (21:40 +0000)]
Merge "modules: camera: Update trace headers to libutils"

10 years agomodules: camera: Add android.jpeg.maxSize metadata
Alex Ray [Mon, 14 Oct 2013 22:58:02 +0000 (15:58 -0700)]
modules: camera: Add android.jpeg.maxSize metadata

Change-Id: I0984b55df0adf8c60b07844003e97b5aac8ece3f

10 years agomodules: camera: Update trace headers to libutils
Alex Ray [Mon, 14 Oct 2013 22:56:43 +0000 (15:56 -0700)]
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

10 years agoUpdate to GpsHal to allow injection/revocation of certificates for SUPL connections.
destradaa [Fri, 13 Sep 2013 22:45:03 +0000 (15:45 -0700)]
Update to GpsHal to allow injection/revocation of certificates for SUPL connections.

Change-Id: I1fd432566623c4cebfb5b53e5f696ad359d49e6f

10 years agoam c9940a2b: am b0c30322: hardware: look in /vendor for default.so
Colin Cross [Wed, 2 Oct 2013 06:10:20 +0000 (23:10 -0700)]
am c9940a2b: am b0c30322: hardware: look in /vendor for default.so

* commit 'c9940a2bfe94dbe2ef3bfe5e8692bf4e3cea5ba0':
  hardware: look in /vendor for default.so

10 years agoam b0c30322: hardware: look in /vendor for default.so
Colin Cross [Wed, 2 Oct 2013 05:21:16 +0000 (22:21 -0700)]
am b0c30322: hardware: look in /vendor for default.so

* commit 'b0c303229fcbc89a0afa8f170de64f2a7fee9d6c':
  hardware: look in /vendor for default.so

10 years agohardware: look in /vendor for default.so
Colin Cross [Mon, 30 Sep 2013 21:23:01 +0000 (14:23 -0700)]
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

10 years agoam 9c73c0a2: am 89cfe208: Merge "Camera3: Add PASSIVE_UNFOCUSED AF state and clean...
Eino-Ville Talvala [Wed, 25 Sep 2013 19:34:42 +0000 (12:34 -0700)]
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

10 years agoam 89cfe208: Merge "Camera3: Add PASSIVE_UNFOCUSED AF state and clean up INACTIVE...
Eino-Ville Talvala [Wed, 25 Sep 2013 19:29:27 +0000 (12:29 -0700)]
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

10 years agoMerge "Camera3: Add PASSIVE_UNFOCUSED AF state and clean up INACTIVE" into klp-dev
Eino-Ville Talvala [Wed, 25 Sep 2013 19:27:54 +0000 (19:27 +0000)]
Merge "Camera3: Add PASSIVE_UNFOCUSED AF state and clean up INACTIVE" into klp-dev

10 years agoam 69716f4b: am 3bf3b45f: Camera2 Test: skip some tests for limited hardware level
Zhijun He [Wed, 25 Sep 2013 02:31:37 +0000 (19:31 -0700)]
am 69716f4b: am 3bf3b45f: Camera2 Test: skip some tests for limited hardware level

* commit '69716f4b1ddc1eb35ac5ef5a528139ed7d20d024':
  Camera2 Test: skip some tests for limited hardware level

10 years agoam 3bf3b45f: Camera2 Test: skip some tests for limited hardware level
Zhijun He [Wed, 25 Sep 2013 02:29:53 +0000 (19:29 -0700)]
am 3bf3b45f: Camera2 Test: skip some tests for limited hardware level

* commit '3bf3b45f2d5eb43b74e1a46ff03ed3e2142b1b38':
  Camera2 Test: skip some tests for limited hardware level

10 years agoCamera2 Test: skip some tests for limited hardware level
Zhijun He [Thu, 19 Sep 2013 06:42:12 +0000 (23:42 -0700)]
Camera2 Test: skip some tests for limited hardware level

Bug: 10388724
Change-Id: Ifd13f72f1b7ff78cf50dc1c238f17c4b4e90d9b0

10 years agoCamera3: Add PASSIVE_UNFOCUSED AF state and clean up INACTIVE
Eino-Ville Talvala [Sat, 21 Sep 2013 00:24:50 +0000 (17:24 -0700)]
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

10 years agoam 8c81382d: am 60cbb526: Camera2 Test: Fix module and burst test issues
Zhijun He [Fri, 20 Sep 2013 18:21:30 +0000 (11:21 -0700)]
am 8c81382d: am 60cbb526: Camera2 Test: Fix module and burst test issues

* commit '8c81382d688e617008d2721b0268a17b369a4c1c':
  Camera2 Test: Fix module and burst test issues

10 years agoam 60cbb526: Camera2 Test: Fix module and burst test issues
Zhijun He [Fri, 20 Sep 2013 04:01:20 +0000 (21:01 -0700)]
am 60cbb526: Camera2 Test: Fix module and burst test issues

* commit '60cbb52613d212236de49b4f22fe059585f8c1b2':
  Camera2 Test: Fix module and burst test issues

10 years agoCamera2 Test: Fix module and burst test issues
Zhijun He [Wed, 18 Sep 2013 16:44:19 +0000 (09:44 -0700)]
Camera2 Test: Fix module and burst test issues

Bug: 10388724
Change-Id: Idc404cf8a7a96c00941aa8f1880734a236cb3737

10 years agoam 8a658946: am b3ac07c0: Camera2 Tests: fix some sanity checks
Zhijun He [Wed, 18 Sep 2013 01:31:52 +0000 (18:31 -0700)]
am 8a658946: am b3ac07c0: Camera2 Tests: fix some sanity checks

* commit '8a658946e9eced055d85f31b27921664c5db914f':
  Camera2 Tests: fix some sanity checks

10 years agoam b3ac07c0: Camera2 Tests: fix some sanity checks
Zhijun He [Wed, 18 Sep 2013 01:29:35 +0000 (18:29 -0700)]
am b3ac07c0: Camera2 Tests: fix some sanity checks

* commit 'b3ac07c0028b0afe8f9b009e37af90ec9a697b44':
  Camera2 Tests: fix some sanity checks

10 years agoCamera2 Tests: fix some sanity checks
Zhijun He [Tue, 17 Sep 2013 23:51:06 +0000 (16:51 -0700)]
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

10 years agoam 0cd89c8c: am cd996be7: Merge "Initial interface for MemoryTrackerHAL" into klp-dev
Rom Lemarchand [Fri, 13 Sep 2013 20:27:07 +0000 (13:27 -0700)]
am 0cd89c8c: am cd996be7: Merge "Initial interface for MemoryTrackerHAL" into klp-dev

* commit '0cd89c8c3619fcc3df3fd14ab74a80c14c34878b':
  Initial interface for MemoryTrackerHAL

10 years agoam 8d24efb0: am 2a512b49: Merge "Camera2 Test: check the right result metadata" into...
Zhijun He [Fri, 13 Sep 2013 20:27:07 +0000 (13:27 -0700)]
am 8d24efb0: am 2a512b49: Merge "Camera2 Test: check the right result metadata" into klp-dev

* commit '8d24efb09659e790739f0762fab4e3ce76c5e727':
  Camera2 Test: check the right result metadata

10 years agoam cd996be7: Merge "Initial interface for MemoryTrackerHAL" into klp-dev
Rom Lemarchand [Fri, 13 Sep 2013 20:20:43 +0000 (13:20 -0700)]
am cd996be7: Merge "Initial interface for MemoryTrackerHAL" into klp-dev

* commit 'cd996be7791b3f78e925532d5820da06d58cf635':
  Initial interface for MemoryTrackerHAL

10 years agoam 2a512b49: Merge "Camera2 Test: check the right result metadata" into klp-dev
Zhijun He [Fri, 13 Sep 2013 20:20:09 +0000 (13:20 -0700)]
am 2a512b49: Merge "Camera2 Test: check the right result metadata" into klp-dev

* commit '2a512b49e028b5714782ab69cba9662e01e25016':
  Camera2 Test: check the right result metadata

10 years agoMerge "Initial interface for MemoryTrackerHAL" into klp-dev
Rom Lemarchand [Fri, 13 Sep 2013 18:23:56 +0000 (18:23 +0000)]
Merge "Initial interface for MemoryTrackerHAL" into klp-dev

10 years agoMerge "Camera2 Test: check the right result metadata" into klp-dev
Zhijun He [Fri, 13 Sep 2013 14:31:07 +0000 (14:31 +0000)]
Merge "Camera2 Test: check the right result metadata" into klp-dev

10 years agoam d587c613: am d9d105a0: consumer_ir: add array length to get carrier freq
Alex Ray [Thu, 12 Sep 2013 16:21:59 +0000 (09:21 -0700)]
am d587c613: am d9d105a0: consumer_ir: add array length to get carrier freq

* commit 'd587c613c6cdabfac70a6a5e836499bc9d4f8309':
  consumer_ir: add array length to get carrier freq

10 years agoam d9d105a0: consumer_ir: add array length to get carrier freq
Alex Ray [Thu, 12 Sep 2013 16:12:47 +0000 (09:12 -0700)]
am d9d105a0: consumer_ir: add array length to get carrier freq

* commit 'd9d105a0ce6bbaa8d1d1cf70a255612a5dd33701':
  consumer_ir: add array length to get carrier freq

10 years agoCamera2 Test: check the right result metadata
Zhijun He [Sun, 8 Sep 2013 17:56:24 +0000 (10:56 -0700)]
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

10 years agoconsumer_ir: add array length to get carrier freq
Alex Ray [Wed, 11 Sep 2013 23:20:07 +0000 (16:20 -0700)]
consumer_ir: add array length to get carrier freq

Change-Id: Iefb424db6f16ffefa40da56c765c9b7a24bea397

10 years agoam 0b4b67c4: am 1d640f05: Merge "Use canonical UniquePtr.h header"
Kenny Root [Thu, 12 Sep 2013 00:24:09 +0000 (17:24 -0700)]
am 0b4b67c4: am 1d640f05: Merge "Use canonical UniquePtr.h header"

* commit '0b4b67c488f68b6d359972098fc44e3126d1f426':
  Use canonical UniquePtr.h header

10 years agoam ddc0748f: am c900b423: Merge "consumerir: make transmit array constant" into klp-dev
Alex Ray [Thu, 12 Sep 2013 00:23:39 +0000 (17:23 -0700)]
am ddc0748f: am c900b423: Merge "consumerir: make transmit array constant" into klp-dev

* commit 'ddc0748f30ed06b09759622df994d4952eb8df4b':
  consumerir: make transmit array constant

10 years agoam 063c87f2: am 22b42bc5: Merge "Clarify return values of get_presentation_position...
Glenn Kasten [Thu, 12 Sep 2013 00:23:10 +0000 (17:23 -0700)]
am 063c87f2: am 22b42bc5: Merge "Clarify return values of get_presentation_position" into klp-dev

* commit '063c87f2b96d6a2914dc57f7e7b9b4541de71dbc':
  Clarify return values of get_presentation_position

10 years agoam 1d640f05: Merge "Use canonical UniquePtr.h header"
Kenny Root [Wed, 11 Sep 2013 21:56:06 +0000 (14:56 -0700)]
am 1d640f05: Merge "Use canonical UniquePtr.h header"

* commit '1d640f05dcedfcaae63eeb90f3d89b16e95d0208':
  Use canonical UniquePtr.h header

10 years agoMerge "Use canonical UniquePtr.h header"
Kenny Root [Wed, 11 Sep 2013 21:52:15 +0000 (21:52 +0000)]
Merge "Use canonical UniquePtr.h header"

10 years agoUse canonical UniquePtr.h header
Kenny Root [Wed, 11 Sep 2013 21:51:09 +0000 (14:51 -0700)]
Use canonical UniquePtr.h header

Change-Id: I0487bd53fc946e1a488d7109eebd402d1ecc5a0a

10 years agoam c900b423: Merge "consumerir: make transmit array constant" into klp-dev
Alex Ray [Wed, 11 Sep 2013 20:49:29 +0000 (13:49 -0700)]
am c900b423: Merge "consumerir: make transmit array constant" into klp-dev

* commit 'c900b4230c5f33abc1b7bc590c4ffe21ec8a59d0':
  consumerir: make transmit array constant

10 years agoMerge "consumerir: make transmit array constant" into klp-dev
Alex Ray [Wed, 11 Sep 2013 20:45:02 +0000 (20:45 +0000)]
Merge "consumerir: make transmit array constant" into klp-dev

10 years agoconsumerir: make transmit array constant
Alex Ray [Wed, 11 Sep 2013 20:36:58 +0000 (13:36 -0700)]
consumerir: make transmit array constant

Change-Id: I0409970d7bd8efe69a69ec038eea4ee3ff9cbfe0

10 years agoam 22b42bc5: Merge "Clarify return values of get_presentation_position" into klp-dev
Glenn Kasten [Wed, 11 Sep 2013 19:33:30 +0000 (12:33 -0700)]
am 22b42bc5: Merge "Clarify return values of get_presentation_position" into klp-dev

* commit '22b42bc528c1a38176572c128323e945ea4a7d0a':
  Clarify return values of get_presentation_position

10 years agoMerge "Clarify return values of get_presentation_position" into klp-dev
Glenn Kasten [Wed, 11 Sep 2013 19:31:26 +0000 (19:31 +0000)]
Merge "Clarify return values of get_presentation_position" into klp-dev

10 years agoam 8473b305: am 09875a2e: modules: add demo consumer IR HAL
Alex Ray [Tue, 10 Sep 2013 19:58:33 +0000 (12:58 -0700)]
am 8473b305: am 09875a2e: modules: add demo consumer IR HAL

* commit '8473b3056da8d2ac85c1790feb7e6675a7148bcd':
  modules: add demo consumer IR HAL

10 years agoam 1e3073bf: am fe46e6a9: libhardware: add Consumer IR HAL API
Alex Ray [Tue, 10 Sep 2013 19:58:32 +0000 (12:58 -0700)]
am 1e3073bf: am fe46e6a9: libhardware: add Consumer IR HAL API

* commit '1e3073bf08962db3a7292e0a324084eb386b5521':
  libhardware: add Consumer IR HAL API

10 years agoam 09875a2e: modules: add demo consumer IR HAL
Alex Ray [Tue, 10 Sep 2013 19:54:16 +0000 (12:54 -0700)]
am 09875a2e: modules: add demo consumer IR HAL

* commit '09875a2eabe6bc6582b40ab8f1cc9eac9c3901d5':
  modules: add demo consumer IR HAL

10 years agoam fe46e6a9: libhardware: add Consumer IR HAL API
Alex Ray [Tue, 10 Sep 2013 19:54:16 +0000 (12:54 -0700)]
am fe46e6a9: libhardware: add Consumer IR HAL API

* commit 'fe46e6a90675fc637a1482e8dfeb27e374b7600d':
  libhardware: add Consumer IR HAL API

10 years agoam 9c83f1d8: am 6a09617e: Merge "keymaster: use new version fields in hw_module"
Kenny Root [Tue, 10 Sep 2013 18:20:40 +0000 (11:20 -0700)]
am 9c83f1d8: am 6a09617e: Merge "keymaster: use new version fields in hw_module"

* commit '9c83f1d8075f701ce6c1686cb6d79cc6605f9d4d':
  keymaster: use new version fields in hw_module

10 years agoam 6a09617e: Merge "keymaster: use new version fields in hw_module"
Kenny Root [Tue, 10 Sep 2013 18:18:11 +0000 (11:18 -0700)]
am 6a09617e: Merge "keymaster: use new version fields in hw_module"

* commit '6a09617eaa2e47e768b87c341459bf80e008a359':
  keymaster: use new version fields in hw_module

10 years agoMerge "keymaster: use new version fields in hw_module"
Kenny Root [Tue, 10 Sep 2013 18:14:58 +0000 (18:14 +0000)]
Merge "keymaster: use new version fields in hw_module"

10 years agokeymaster: use new version fields in hw_module
Kenny Root [Thu, 5 Sep 2013 05:17:56 +0000 (22:17 -0700)]
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 c124b23f94a0a88e872253720c0e27594a9a9938)

Bug: 10600582
Change-Id: Ia2b0cbeca5c507600228c39ec7a8402f819f8804

10 years agoClarify return values of get_presentation_position
Glenn Kasten [Tue, 10 Sep 2013 16:23:07 +0000 (09:23 -0700)]
Clarify return values of get_presentation_position

Change-Id: I495d7abd7e366849308c66bcaee99554dcd244aa

10 years agomodules: add demo consumer IR HAL
Alex Ray [Thu, 5 Sep 2013 06:32:55 +0000 (23:32 -0700)]
modules: add demo consumer IR HAL

Change-Id: Iaae40c06af0dc008429d5dee4f45dc0b156957a1

10 years agolibhardware: add Consumer IR HAL API
Alex Ray [Thu, 5 Sep 2013 06:32:14 +0000 (23:32 -0700)]
libhardware: add Consumer IR HAL API

Change-Id: I68db7911784aa802b378a5e1dad62397da16b03b

10 years agoInitial interface for MemoryTrackerHAL
Colin Cross [Fri, 6 Sep 2013 00:45:07 +0000 (17:45 -0700)]
Initial interface for MemoryTrackerHAL

Bug: 10294768
Change-Id: I65cb28c8f77f3dafe5b47b24479c647fa72fc65f

10 years agoam 32bf9c8e: am eb485256: Merge "Camera2 Tests: Fix stream id types" into klp-dev
Zhijun He [Mon, 9 Sep 2013 18:32:59 +0000 (11:32 -0700)]
am 32bf9c8e: am eb485256: Merge "Camera2 Tests: Fix stream id types" into klp-dev

* commit '32bf9c8ecc682ddd00b915554bb15182086b4af4':
  Camera2 Tests: Fix stream id types

10 years agoam eb485256: Merge "Camera2 Tests: Fix stream id types" into klp-dev
Zhijun He [Mon, 9 Sep 2013 18:31:28 +0000 (11:31 -0700)]
am eb485256: Merge "Camera2 Tests: Fix stream id types" into klp-dev

* commit 'eb485256e99e97653773024951568aadcc60f6a4':
  Camera2 Tests: Fix stream id types

10 years agoMerge "Camera2 Tests: Fix stream id types" into klp-dev
Zhijun He [Mon, 9 Sep 2013 18:28:12 +0000 (18:28 +0000)]
Merge "Camera2 Tests: Fix stream id types" into klp-dev

10 years agoam 8e3c71de: am 51dbad3b: Merge "hardware: camera_common: add module vendor tag ops...
Alex Ray [Mon, 9 Sep 2013 17:38:04 +0000 (10:38 -0700)]
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

10 years agoam 51dbad3b: Merge "hardware: camera_common: add module vendor tag ops" into klp-dev
Alex Ray [Mon, 9 Sep 2013 17:34:33 +0000 (10:34 -0700)]
am 51dbad3b: Merge "hardware: camera_common: add module vendor tag ops" into klp-dev

* commit '51dbad3bfa313a4ba9219e3d9c4b3c1b2a15d52f':
  hardware: camera_common: add module vendor tag ops

10 years agoMerge "hardware: camera_common: add module vendor tag ops" into klp-dev
Alex Ray [Mon, 9 Sep 2013 17:29:13 +0000 (17:29 +0000)]
Merge "hardware: camera_common: add module vendor tag ops" into klp-dev

10 years agohardware: camera_common: add module vendor tag ops
Alex Ray [Thu, 13 Jun 2013 19:40:52 +0000 (12:40 -0700)]
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

10 years agoCamera2 Tests: Fix stream id types
Zhijun He [Fri, 6 Sep 2013 22:35:09 +0000 (15:35 -0700)]
Camera2 Tests: Fix stream id types

Bug: 10604704
Change-Id: I5edddb1011d6744225c59f44bd6df8ae4234d336

10 years agoam 474cbcbb: am c124b23f: keymaster: use new version fields in hw_module
Kenny Root [Thu, 5 Sep 2013 07:32:39 +0000 (00:32 -0700)]
am 474cbcbb: am c124b23f: keymaster: use new version fields in hw_module

* commit '474cbcbb2ed5bebcd2c5f45cbba6a163e9265742':
  keymaster: use new version fields in hw_module

10 years agoam c124b23f: keymaster: use new version fields in hw_module
Kenny Root [Thu, 5 Sep 2013 07:30:25 +0000 (00:30 -0700)]
am c124b23f: keymaster: use new version fields in hw_module

* commit 'c124b23f94a0a88e872253720c0e27594a9a9938':
  keymaster: use new version fields in hw_module

10 years agokeymaster: use new version fields in hw_module
Kenny Root [Thu, 5 Sep 2013 05:17:56 +0000 (22:17 -0700)]
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

10 years agoam 76b73a39: am 2541a0a8: Add support for DSA and ECDSA key types
Kenny Root [Tue, 3 Sep 2013 17:34:46 +0000 (10:34 -0700)]
am 76b73a39: am 2541a0a8: Add support for DSA and ECDSA key types

* commit '76b73a39e39f1dd965d2ed685bbdf36403e0356a':
  Add support for DSA and ECDSA key types

10 years agoam 2541a0a8: Add support for DSA and ECDSA key types
Kenny Root [Tue, 3 Sep 2013 17:32:05 +0000 (10:32 -0700)]
am 2541a0a8: Add support for DSA and ECDSA key types

* commit '2541a0a8f7a2c86658d435efb49843a88b4d97e0':
  Add support for DSA and ECDSA key types

10 years agoAdd support for DSA and ECDSA key types
Kenny Root [Mon, 19 Aug 2013 16:51:35 +0000 (09:51 -0700)]
Add support for DSA and ECDSA key types

(cherry picked from commit 6e1683f5d508a4c1ff761a9a3508619ac5ac6ed7)

Bug: 10600582
Change-Id: I8e5b66baa70b37031198260853bb5355df75e23d

10 years agoam a928d816: am bd5015e0: Merge "Add support for DSA and ECDSA key types"
Kenny Root [Tue, 3 Sep 2013 07:16:54 +0000 (00:16 -0700)]
am a928d816: am bd5015e0: Merge "Add support for DSA and ECDSA key types"

* commit 'a928d816a4a7410cd18f114f6d0ad1837e07bdd2':
  Add support for DSA and ECDSA key types

10 years agoam bd5015e0: Merge "Add support for DSA and ECDSA key types"
Kenny Root [Tue, 3 Sep 2013 07:14:20 +0000 (00:14 -0700)]
am bd5015e0: Merge "Add support for DSA and ECDSA key types"

* commit 'bd5015e0f3b79d8b8e7f9b1926bbf76985ac8c61':
  Add support for DSA and ECDSA key types

10 years agoMerge "Add support for DSA and ECDSA key types"
Kenny Root [Tue, 3 Sep 2013 07:11:08 +0000 (07:11 +0000)]
Merge "Add support for DSA and ECDSA key types"

10 years agoAdd support for DSA and ECDSA key types
Kenny Root [Mon, 19 Aug 2013 16:51:35 +0000 (09:51 -0700)]
Add support for DSA and ECDSA key types

Change-Id: I4b7d11c0915c716a0f1be65f5933f33a36e0fb4b

10 years agoam 5dae225d: Merge "get_presentation_position" into klp-dev
Glenn Kasten [Fri, 30 Aug 2013 00:08:09 +0000 (17:08 -0700)]
am 5dae225d: Merge "get_presentation_position" into klp-dev

* commit '5dae225de7b5ccf965d1496bc4343828a250f788':
  get_presentation_position

10 years agoMerge "get_presentation_position" into klp-dev
Glenn Kasten [Fri, 30 Aug 2013 00:02:56 +0000 (00:02 +0000)]
Merge "get_presentation_position" into klp-dev

10 years agoam 935799d6: Addition of EFFECT_CMD_OFFLOAD for effects offload
jpadmana [Thu, 29 Aug 2013 21:09:31 +0000 (14:09 -0700)]
am 935799d6: Addition of EFFECT_CMD_OFFLOAD for effects offload

* commit '935799d63f0d654f350a640001077616572a4b63':
  Addition of EFFECT_CMD_OFFLOAD for effects offload

10 years agoget_presentation_position
Glenn Kasten [Thu, 22 Aug 2013 23:27:22 +0000 (16:27 -0700)]
get_presentation_position

Change-Id: Iedc4df9018321d7273eaa862e913ad6d9a844618

10 years agoAddition of EFFECT_CMD_OFFLOAD for effects offload
jpadmana [Tue, 25 Jun 2013 09:18:49 +0000 (14:48 +0530)]
Addition of EFFECT_CMD_OFFLOAD for effects offload

Added EFFECT_CMD_OFFLOAD command to audio effect control
interface. It is used by the framework to indicate if
the playback thread the effect is attached to is offloaded
of not.

Added effect flag EFFECT_FLAG_OFFLOAD_SUPPORTED indicating if
the effect implementation supports offloading to a DSP.

Change-Id: I26553576657d3aa9cd0cdcd5785c813b02f48136
Signed-off-by: jpadmana <jayashree.r.padmanaban@intel.com>
Signed-off-by: Eric Laurent <elaurent@google.com>
11 years agoam 59caeb14: Merge "Fix file permissions" into klp-dev
Glenn Kasten [Thu, 22 Aug 2013 22:32:00 +0000 (15:32 -0700)]
am 59caeb14: Merge "Fix file permissions" into klp-dev

* commit '59caeb14a7cb7cbc74db725343922c81f0e2e3aa':
  Fix file permissions

11 years agoMerge "Fix file permissions" into klp-dev
Glenn Kasten [Thu, 22 Aug 2013 22:26:35 +0000 (22:26 +0000)]
Merge "Fix file permissions" into klp-dev

11 years agoam 69e82d2d: Merge "Fix typo in FlpHal" into klp-dev
destradaa [Thu, 22 Aug 2013 19:43:20 +0000 (12:43 -0700)]
am 69e82d2d: Merge "Fix typo in FlpHal" into klp-dev

* commit '69e82d2df615b77ff868309b8f2c0323eadb42c5':
  Fix typo in FlpHal

11 years agoMerge "Fix typo in FlpHal" into klp-dev
destradaa [Thu, 22 Aug 2013 19:37:11 +0000 (19:37 +0000)]
Merge "Fix typo in FlpHal" into klp-dev

11 years agoam 9595f7cf: remote submix: fix test on sampling valid rates
Eric Laurent [Thu, 22 Aug 2013 19:09:08 +0000 (12:09 -0700)]
am 9595f7cf: remote submix: fix test on sampling valid rates

* commit '9595f7cff6ddbeb58350fadeaf21da3f14fb76bc':
  remote submix: fix test on sampling valid rates

11 years agoremote submix: fix test on sampling valid rates
Eric Laurent [Thu, 22 Aug 2013 16:55:13 +0000 (09:55 -0700)]
remote submix: fix test on sampling valid rates

Change-Id: I4e9e378940bb56202a6e6882f561b3293ad7225d

11 years agoFix typo in FlpHal
destradaa [Wed, 21 Aug 2013 19:41:19 +0000 (12:41 -0700)]
Fix typo in FlpHal

Change-Id: I0a0598c4755052e071d793fbacf0aa25dfca6e5c

11 years agoFix file permissions
Glenn Kasten [Tue, 20 Aug 2013 19:48:44 +0000 (12:48 -0700)]
Fix file permissions

Change-Id: Iffc2941d98ee16796cf3d44dec1cfa376d9362bb