OSDN Git Service

android-x86/hardware-libhardware.git
11 years agoMerge "Sensor HAL updates" into jb-mr2-dev
Etienne Le Grand [Fri, 5 Apr 2013 04:05:39 +0000 (04:05 +0000)]
Merge "Sensor HAL updates" into jb-mr2-dev

11 years agoMerge "Log when creating a second buffer mapping in a process" into jb-mr2-dev
Jesse Hall [Thu, 4 Apr 2013 22:36:35 +0000 (22:36 +0000)]
Merge "Log when creating a second buffer mapping in a process" into jb-mr2-dev

11 years agoSensor HAL updates
Etienne Le Grand [Thu, 28 Mar 2013 01:59:10 +0000 (18:59 -0700)]
Sensor HAL updates

Improve explanation of Batch mode
Put the 4th component of the unit quaternion back in the rotation vector
Modify rotation vector description
Modify definition of uncalibrated sensor event
Remove query()

Change-Id: I7564073fac0e2467bcfca040b259d9d20e2688c5

11 years agoSet max RC attribute count to 7
Ravi Nagarajan [Fri, 22 Mar 2013 11:18:47 +0000 (04:18 -0700)]
Set max RC attribute count to 7

Per spec max RC attributes are 7

Change-Id: Ied4b5ff9487aab32b7e0c824ecaa20b21079c458

11 years agoMerge "Camera3: Documentation additions" into jb-mr2-dev
Eino-Ville Talvala [Mon, 1 Apr 2013 16:39:20 +0000 (16:39 +0000)]
Merge "Camera3: Documentation additions" into jb-mr2-dev

11 years agoCamera3: Documentation additions
Eino-Ville Talvala [Sat, 16 Mar 2013 23:53:28 +0000 (16:53 -0700)]
Camera3: Documentation additions

- Detailed documentation of the 3A state machines
  (autofocus, autoexposure, auto-whitebalance)
- Add error return value for out-of-sequence device calls
- Spelling fixes

Change-Id: Icc4e1980b1ff058425a42bc665d345070944b173

11 years agoMerge "Gps geofence." into jb-mr2-dev
Jaikumar Ganesh [Fri, 29 Mar 2013 18:58:44 +0000 (18:58 +0000)]
Merge "Gps geofence." into jb-mr2-dev

11 years agoGps geofence.
Jaikumar Ganesh [Fri, 29 Mar 2013 18:56:36 +0000 (11:56 -0700)]
Gps geofence.

Make the add / remove / pause / resume asynchronous.

Change-Id: I6d6d254613623b564f1cb6a59742fe000e47ac1e

11 years agoLog when creating a second buffer mapping in a process
Jesse Hall [Thu, 28 Mar 2013 23:51:25 +0000 (16:51 -0700)]
Log when creating a second buffer mapping in a process

Bug: 8468756
Change-Id: Ia883f459ea9e2648ca4a0b5a6f09ded4f46f13b3

11 years agoMerge "Remove pid check in register/unregister" into jb-mr2-dev
Jesse Hall [Thu, 28 Mar 2013 21:24:55 +0000 (21:24 +0000)]
Merge "Remove pid check in register/unregister" into jb-mr2-dev

11 years agoRemove pid check in register/unregister
Jesse Hall [Thu, 28 Mar 2013 18:04:16 +0000 (11:04 -0700)]
Remove pid check in register/unregister

The register/unregister gralloc calls were avoiding
mmapping/munmapping the shared memory region if the buffer was created
by the current process. This is left over from the pmem-based
implementation, where trying to map the same region twice in the same
process would fail, or would reuse a single mapping without
refcounting.

This causes problems if a buffer is
- allocated in process A,
- transferred from A to process B and registered there
- unregistered/freed in A
- transferred back from B to A and re-registered

Process A then has a new handle to the buffer, but since it originally
created the buffer it will not be mmapped, so trying to read or write
the buffer will crash.

With ashmem, mmaping a region twice in the same process creates two
distinct mappings which can be used and munmapped independently. So
we no longer need to avoid mmapping again in the allocating process.

Bug: 8468756
Change-Id: I167bec5ca07e5534c5e2115630fe8386e481388e

11 years agocamera2_test: Allow for HAL2 version >= 2.0 (i.e. 2.1, 3.0, etc)
Igor Murashkin [Wed, 27 Mar 2013 01:07:31 +0000 (18:07 -0700)]
camera2_test: Allow for HAL2 version >= 2.0 (i.e. 2.1, 3.0, etc)

Change-Id: If9004d2a6d5fc581b8f63814f2f115bcd7fa5a34

11 years agoMerge "camera_common.h: Add STATUS_ENUMERATING enum" into jb-mr2-dev
Igor Murashkin [Thu, 21 Mar 2013 23:16:47 +0000 (23:16 +0000)]
Merge "camera_common.h: Add STATUS_ENUMERATING enum" into jb-mr2-dev

11 years agocamera_common.h: Add STATUS_ENUMERATING enum
Igor Murashkin [Mon, 18 Mar 2013 20:30:14 +0000 (13:30 -0700)]
camera_common.h: Add STATUS_ENUMERATING enum

Change-Id: I0986d37364a2666d493cb771fa76967aa051ca5d

11 years agoMerge "Initial version of RC HAL for AVRCP 1.3" into jb-mr2-dev
Zhihai Xu [Thu, 21 Mar 2013 16:46:43 +0000 (16:46 +0000)]
Merge "Initial version of RC HAL for AVRCP 1.3" into jb-mr2-dev

11 years agoInitial version of RC HAL for AVRCP 1.3
Ravi Nagarajan [Tue, 26 Feb 2013 18:34:41 +0000 (10:34 -0800)]
Initial version of RC HAL for AVRCP 1.3

Change-Id: Idbea1294d091cbe0b9ebc3a7a0cad9f0c738e32c

11 years agoMerge "Camera: Minor fixes to camera3 HAL interface" into jb-mr2-dev
Eino-Ville Talvala [Thu, 14 Mar 2013 19:00:33 +0000 (19:00 +0000)]
Merge "Camera: Minor fixes to camera3 HAL interface" into jb-mr2-dev

11 years agoCamera: Minor fixes to camera3 HAL interface
Eino-Ville Talvala [Wed, 6 Mar 2013 21:23:31 +0000 (13:23 -0800)]
Camera: Minor fixes to camera3 HAL interface

- Add explicit status to buffer, to allow simple reporting
  of buffer filling failures.
- Clarify error management wording
- Clarify close() preconditions

Change-Id: I1660103aa1822d194ec0afab44e09554c1ac0782

11 years agoam 1d0c7e05: am 6e5236ee: am 5c8f84a1: am 3a18bccc: (-s ours) am 431cd416: (-s ours...
Jean-Baptiste Queru [Mon, 11 Mar 2013 19:41:19 +0000 (12:41 -0700)]
am 1d0c7e05: am 6e5236ee: am 5c8f84a1: am 3a18bccc: (-s ours) am 431cd416: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '1d0c7e05d80ab18c1a859782313448dc6a31bab9':

11 years agoam 6e5236ee: am 5c8f84a1: am 3a18bccc: (-s ours) am 431cd416: (-s ours) Reconcile...
Jean-Baptiste Queru [Mon, 11 Mar 2013 19:34:30 +0000 (12:34 -0700)]
am 6e5236ee: am 5c8f84a1: am 3a18bccc: (-s ours) am 431cd416: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '6e5236ee082070242f6e5e6e0fe0d1892368880e':

11 years agoam 5c8f84a1: am 3a18bccc: (-s ours) am 431cd416: (-s ours) Reconcile with jb-mr1...
Jean-Baptiste Queru [Mon, 11 Mar 2013 19:32:00 +0000 (12:32 -0700)]
am 5c8f84a1: am 3a18bccc: (-s ours) am 431cd416: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '5c8f84a15fba998baf9703c81e86a25048ce368a':

11 years agoam 3a18bccc: (-s ours) am 431cd416: (-s ours) Reconcile with jb-mr1-release - do...
Jean-Baptiste Queru [Mon, 11 Mar 2013 19:28:32 +0000 (12:28 -0700)]
am 3a18bccc: (-s ours) am 431cd416: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '3a18bcccb201b37e5b0cdff76febafb214cb8b90':

11 years agoam 431cd416: (-s ours) Reconcile with jb-mr1-release - do not merge
Jean-Baptiste Queru [Mon, 11 Mar 2013 19:23:00 +0000 (12:23 -0700)]
am 431cd416: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '431cd41604208d7c30788d6e3c6655a34fd3e157':

11 years agoReconcile with jb-mr1-release - do not merge
Jean-Baptiste Queru [Mon, 11 Mar 2013 19:20:12 +0000 (12:20 -0700)]
Reconcile with jb-mr1-release - do not merge

11 years agoMerge "libhardware: Add camera_info typedef" into jb-mr2-dev
Alex Ray [Fri, 8 Mar 2013 01:58:30 +0000 (01:58 +0000)]
Merge "libhardware: Add camera_info typedef" into jb-mr2-dev

11 years agoMinor fix in significant motion description
Etienne Le Grand [Thu, 7 Mar 2013 20:22:32 +0000 (12:22 -0800)]
Minor fix in significant motion description

Change-Id: I155181e43750948a6fd6fc246a4e0203cea7c9cb

11 years agoMerge "Add significant motion description" into jb-mr2-dev
Etienne Le Grand [Thu, 7 Mar 2013 18:34:08 +0000 (18:34 +0000)]
Merge "Add significant motion description" into jb-mr2-dev

11 years agoAdd significant motion description
Etienne Le Grand [Wed, 6 Mar 2013 06:00:33 +0000 (22:00 -0800)]
Add significant motion description

Change-Id: I56de3f2c12243b3d25cd825b66f7685e674533ff

11 years agoMerge "Camera: Fix incorrect pointer types" into jb-mr2-dev
Eino-Ville Talvala [Wed, 6 Mar 2013 21:28:52 +0000 (21:28 +0000)]
Merge "Camera: Fix incorrect pointer types" into jb-mr2-dev

11 years agoCamera: Fix incorrect pointer types
Eino-Ville Talvala [Wed, 6 Mar 2013 21:21:11 +0000 (13:21 -0800)]
Camera: Fix incorrect pointer types

- Array of streams given to configure_streams() must be an array of
  pointers to streams, to allow framework to fulfill stream structure
  lifetime guarantees.

- buffer_handle_t needs extra level of indirection to match HAL1 & 2.

Change-Id: Iee071da39218a748933c3dfa7bccb66fe92c05f1

11 years agolibhardware: Add camera_info typedef
Alex Ray [Thu, 7 Feb 2013 23:44:24 +0000 (15:44 -0800)]
libhardware: Add camera_info typedef

Change-Id: I67ce80c886723d4dba7f799b6b135aa7026c2187

11 years agoSensors HAL iterative update for jb-mr2
Etienne Le Grand [Wed, 27 Feb 2013 03:17:20 +0000 (19:17 -0800)]
Sensors HAL iterative update for jb-mr2

Specified more precisely what the uncalibrated magnetometer should be
Added uncalibrated sensors event struct
Specified that rotation vector and game rotation vector have to use gyroscopes
Added magnetic field rotation vector
Added accuracy field to rotation vector and magnetometer rotation vector
Added section on comparative importance of batching different sensors
Specified that one-shot sensors must deactivate themselves before sending an event.

Change-Id: Ibc30ce6fc30e698af49a91930bd5a8316b6568b9

11 years agomodules: camera: make Camera object id const
Alex Ray [Thu, 28 Feb 2013 23:40:08 +0000 (15:40 -0800)]
modules: camera: make Camera object id const

Change-Id: Ic36fa7c6193086aa6415647ff8fe59cc358dd99f

11 years agoInitial version of BLE support for Bluedroid
Ganesh Ganapathi Batta [Tue, 5 Feb 2013 23:23:45 +0000 (15:23 -0800)]
Initial version of BLE support for Bluedroid

Change-Id: Iacf3a56943b31c4fd4f4b833ed675a35cbd47104

11 years agomodules: camera: Camera v3 Devices
Alex Ray [Mon, 25 Feb 2013 23:02:16 +0000 (15:02 -0800)]
modules: camera: Camera v3 Devices

Default camera HAL statically allocates camera devices. Update camera
device to API v3.

Change-Id: Ic53ffcf3b746b9b4011b932e26dbb0f533cba554

11 years agomodules: camera: Update to v2.1 camera module API
Alex Ray [Thu, 21 Feb 2013 01:46:41 +0000 (17:46 -0800)]
modules: camera: Update to v2.1 camera module API

Refactor the camera module into a single CameraHAL object.  Adds
set_callbacks, new in the v2.1 module API.

Change-Id: I4da677c28d7425f545f68998844fcfa4caf0feb9

11 years agomodules: camera: Hide HAL symbols DO NOT MERGE
Alex Ray [Mon, 18 Feb 2013 23:38:05 +0000 (15:38 -0800)]
modules: camera: Hide HAL symbols DO NOT MERGE

Explicitly hide all symbols from being exported from the camera HAL
except the symbol required to load the module.

Change-Id: I940b24b8d3895f46e63df3c28e43b8cb012bd637

11 years agoAdd GPS_GEOFENCE_ERROR constants.
Jaikumar Ganesh [Mon, 25 Feb 2013 19:43:33 +0000 (11:43 -0800)]
Add GPS_GEOFENCE_ERROR constants.

Change APIs to return error constants.

Change-Id: I221e94060c1549c7ffc8e05c7ad4802b981a31bf

11 years agoMerge "camera3: remove redundant hardware error condition"
Alex Ray [Fri, 22 Feb 2013 21:06:52 +0000 (21:06 +0000)]
Merge "camera3: remove redundant hardware error condition"

11 years agoMerge "Tests: Camera: Refactor CameraMetadata into frameworks/av"
Igor Murashkin [Fri, 22 Feb 2013 19:29:01 +0000 (19:29 +0000)]
Merge "Tests: Camera: Refactor CameraMetadata into frameworks/av"

11 years agoMerge "Tests: Camera2: Add Y8/Y16 to Stream create/delete tests"
Igor Murashkin [Fri, 22 Feb 2013 19:29:01 +0000 (19:29 +0000)]
Merge "Tests: Camera2: Add Y8/Y16 to Stream create/delete tests"

11 years agoAdd GPS geofencing HAL.
Jaikumar Ganesh [Tue, 5 Feb 2013 01:22:04 +0000 (17:22 -0800)]
Add GPS geofencing HAL.

This adds APIs for doing GPS Geofencing in the hardware.

Change-Id: I32564d7620969e6a1cd3c32242b7805d26b7af1e

11 years agoTests: Camera: Refactor CameraMetadata into frameworks/av
Igor Murashkin [Thu, 14 Feb 2013 01:33:36 +0000 (17:33 -0800)]
Tests: Camera: Refactor CameraMetadata into frameworks/av

Change-Id: Ibc2917a18163f07b5e37eb83abb3d1ef919a5766

11 years agoTests: Camera2: Add Y8/Y16 to Stream create/delete tests
Igor Murashkin [Mon, 11 Feb 2013 23:52:03 +0000 (15:52 -0800)]
Tests: Camera2: Add Y8/Y16 to Stream create/delete tests

Change-Id: I7e066569edcab84c0d61fe7a4ae5c3e2683f63eb

11 years agoMerge "Revert "Add GPS geofencing HAL.""
Jaikumar Ganesh [Thu, 21 Feb 2013 22:56:20 +0000 (22:56 +0000)]
Merge "Revert "Add GPS geofencing HAL.""

11 years agoRevert "Add GPS geofencing HAL."
Jaikumar Ganesh [Thu, 21 Feb 2013 22:55:50 +0000 (14:55 -0800)]
Revert "Add GPS geofencing HAL."

This reverts commit 86abc8cf18a5895e5bdf1b9e5bd7bf9db603a7fe.

11 years agoMerge "Add GPS geofencing HAL."
Jaikumar Ganesh [Thu, 21 Feb 2013 22:42:49 +0000 (22:42 +0000)]
Merge "Add GPS geofencing HAL."

11 years agoAdd GPS geofencing HAL.
Jaikumar Ganesh [Tue, 5 Feb 2013 01:22:04 +0000 (17:22 -0800)]
Add GPS geofencing HAL.

This adds APIs for doing GPS Geofencing in the hardware.

Change-Id: Ia353a0919bfc44d31d152f10e3d20080daffd2e2

11 years agoMerge "WIP: Camera HAL module 2.1, device 2.1"
Eino-Ville Talvala [Tue, 19 Feb 2013 18:23:54 +0000 (18:23 +0000)]
Merge "WIP: Camera HAL module 2.1, device 2.1"

11 years agofix build: SurfaceTextureClient to Surface rename
Mathias Agopian [Fri, 15 Feb 2013 22:27:15 +0000 (14:27 -0800)]
fix build: SurfaceTextureClient to Surface rename

Change-Id: I8b4bbccc570ddfaaad6f7eeaa72edde05a720b35

11 years agocamera3: remove redundant hardware error condition
Alex Ray [Fri, 15 Feb 2013 21:47:24 +0000 (13:47 -0800)]
camera3: remove redundant hardware error condition

Change-Id: I8cc538f82cf42972cc4d7cb155539222c41b4e0a

11 years agoWIP: Camera HAL module 2.1, device 2.1
Eino-Ville Talvala [Wed, 13 Feb 2013 23:29:48 +0000 (15:29 -0800)]
WIP: Camera HAL module 2.1, device 2.1

- Support a simple callback from camera HAL module to framework, to
  indicate a change to module configuration or status.

- Add support for per-instance metadata to camera 2 device HAL.

Change-Id: I25699ff096c4f3578b9e54c7e6e60ce2449adc82

11 years agoRefactoring: Rename SurfaceTextureClient to Surface
Mathias Agopian [Fri, 15 Feb 2013 01:34:35 +0000 (17:34 -0800)]
Refactoring: Rename SurfaceTextureClient to Surface

Change-Id: Iff197c557c06673a1ad85a9bbd36caa38efb88b7

11 years agoCamera: Minor cleanup to HAL 3.0 header
Eino-Ville Talvala [Fri, 15 Feb 2013 20:09:48 +0000 (12:09 -0800)]
Camera: Minor cleanup to HAL 3.0 header

Change-Id: I64c61687cbf5850341d9e528c47b7b4dca773546

11 years agoCamera device HAL 3.0
Eino-Ville Talvala [Wed, 28 Nov 2012 02:06:06 +0000 (18:06 -0800)]
Camera device HAL 3.0

- High-level behavior is identical to device HAL 2.0
- Interface is cleaned up and simplified greatly

Change-Id: Ia867bbf9484be2256470f4acfab7fc3d47e408f4

11 years agoRevert "libhardware: Add camera_info typedef"
Alex Ray [Thu, 14 Feb 2013 01:12:52 +0000 (17:12 -0800)]
Revert "libhardware: Add camera_info typedef"

This reverts commit 71cb21980a8f6a7ab3b5f86b6d81e8584769f489.

11 years agoMerge "libhardware: Add camera_info typedef"
Alex Ray [Wed, 13 Feb 2013 23:58:41 +0000 (23:58 +0000)]
Merge "libhardware: Add camera_info typedef"

11 years agoMerge "audio effects: fix link problem with NULL UUID"
Eric Laurent [Mon, 11 Feb 2013 23:51:28 +0000 (23:51 +0000)]
Merge "audio effects: fix link problem with NULL UUID"

11 years agoAudio policy exposes stream remote activity
Jean-Michel Trivi [Tue, 5 Feb 2013 00:27:18 +0000 (16:27 -0800)]
Audio policy exposes stream remote activity

Bug 7485803

Change-Id: Ib9ad2338d9e0c5f816de8d56d7b41c3771c0a8c3

11 years agoRevert "only orientation and geomagnetic field sensors support the "status" field"
Jeff Brown [Sat, 9 Feb 2013 02:46:33 +0000 (02:46 +0000)]
Revert "only orientation and geomagnetic field sensors support the "status" field"

This reverts commit fbe985ca9c8cd502ce9b8b0332dbdd639e9b723e

Change-Id: I7c65fd3326fe08363b5ed491f6438e541df879d4

11 years agolibhardware: Add camera_info typedef
Alex Ray [Thu, 7 Feb 2013 23:44:24 +0000 (15:44 -0800)]
libhardware: Add camera_info typedef

Change-Id: Icfc0b2dc7739313a6266938f0e2b46fa823ba61e

11 years agoaudio effects: fix link problem with NULL UUID
Eric Laurent [Thu, 7 Feb 2013 19:31:48 +0000 (11:31 -0800)]
audio effects: fix link problem with NULL UUID

A special value for NULL effect UUID is declared as const
in audio_effect.h. This prevents several modules including
audio_effect.h to be linked together.

The fix consists in declaring the value as static const.

Change-Id: I86e74dc9da8eaed13a3ad44765abb9cd1e80f316

11 years agoonly orientation and geomagnetic field sensors support the "status" field
Mathias Agopian [Thu, 7 Feb 2013 03:06:57 +0000 (19:06 -0800)]
only orientation and geomagnetic field sensors support the "status" field

enforce this in the HAL API.

Change-Id: I54d2fde84a852482a96140f8f1945cc6044e628a

11 years agoimproves sensors HAL documentation
Mathias Agopian [Tue, 29 Jan 2013 23:52:10 +0000 (15:52 -0800)]
improves sensors HAL documentation

- added a period parameter to batch()
- added drift-estimate to uncalibrated gyro

Change-Id: I9cba8099c8906ba111d401ecbb4341e338b338a8

11 years agoadd support for plane-alpha in HWC
Mathias Agopian [Wed, 30 Jan 2013 02:57:48 +0000 (18:57 -0800)]
add support for plane-alpha in HWC

Change-Id: Ied228e689ca892c505fbd811fd2b8579287e4ac6

11 years agoam 46e9befb: (-s ours) am 4c645d0a: Camera2: Fix metadata symbols: DO NOT MERGE
Igor Murashkin [Thu, 31 Jan 2013 02:59:47 +0000 (18:59 -0800)]
am 46e9befb: (-s ours) am 4c645d0a: Camera2: Fix metadata symbols: DO NOT MERGE

# Via Android Git Automerger (1) and Igor Murashkin (1)
* commit '46e9befbe45e0d53c7ad1cb0f570865c08335aab':
  Camera2: Fix metadata symbols: DO NOT MERGE

11 years agoam e0731653: (-s ours) am 803a8c76: Revert "Camera2: Tests: Future-alias select metad...
Igor Murashkin [Thu, 31 Jan 2013 02:59:47 +0000 (18:59 -0800)]
am e0731653: (-s ours) am 803a8c76: Revert "Camera2: Tests: Future-alias select metadata symbols: DO NOT MERGE": DO NOT MERGE

# Via Android Git Automerger (1) and Igor Murashkin (1)
* commit 'e073165389625fcb54c4d6b2565a6ada2d125048':
  Revert "Camera2: Tests: Future-alias select metadata symbols: DO NOT MERGE": DO NOT MERGE

11 years agoam 4c645d0a: Camera2: Fix metadata symbols: DO NOT MERGE
Igor Murashkin [Thu, 31 Jan 2013 02:57:20 +0000 (18:57 -0800)]
am 4c645d0a: Camera2: Fix metadata symbols: DO NOT MERGE

# Via Igor Murashkin
* commit '4c645d0a9bd4721fe65f1c2264fed7a5830428a2':
  Camera2: Fix metadata symbols: DO NOT MERGE

11 years agoam 803a8c76: Revert "Camera2: Tests: Future-alias select metadata symbols: DO NOT...
Igor Murashkin [Thu, 31 Jan 2013 02:57:19 +0000 (18:57 -0800)]
am 803a8c76: Revert "Camera2: Tests: Future-alias select metadata symbols: DO NOT MERGE": DO NOT MERGE

# Via Igor Murashkin
* commit '803a8c76c532f1548425fc1a3d3d9d04554b29f3':
  Revert "Camera2: Tests: Future-alias select metadata symbols: DO NOT MERGE": DO NOT MERGE

11 years agoCamera2: Fix metadata symbols: DO NOT MERGE
Igor Murashkin [Mon, 3 Dec 2012 21:33:08 +0000 (13:33 -0800)]
Camera2: Fix metadata symbols: DO NOT MERGE

Change-Id: I5d7c8416b8ed8effca699aa9e51068f5678927ea

11 years agoRevert "Camera2: Tests: Future-alias select metadata symbols: DO NOT MERGE": DO NOT...
Igor Murashkin [Thu, 31 Jan 2013 00:33:31 +0000 (16:33 -0800)]
Revert "Camera2: Tests: Future-alias select metadata symbols: DO NOT MERGE": DO NOT MERGE

This reverts commit 4ac84a428d05ce7963f201df7ca308acb88fd8d8.

11 years agorenamed sensor PEDOMETER to STEP_DETECTOR
Mathias Agopian [Tue, 29 Jan 2013 01:54:41 +0000 (17:54 -0800)]
renamed sensor PEDOMETER to STEP_DETECTOR

pedometer was confusing.

Change-Id: Ib40c8034e9038f7153299aed4ee33a0a9f1e900e

11 years agoam c4f18ad3: am af05c912: am a8c06116: Merge "Remove remnants of HWC 0.x"
Jesse Hall [Mon, 14 Jan 2013 17:53:43 +0000 (09:53 -0800)]
am c4f18ad3: am af05c912: am a8c06116: Merge "Remove remnants of HWC 0.x"

* commit 'c4f18ad3bfcd9c4d8867ee3b366ed24f13371c47':
  Remove remnants of HWC 0.x

11 years agoam af05c912: am a8c06116: Merge "Remove remnants of HWC 0.x"
Jesse Hall [Mon, 14 Jan 2013 17:51:22 +0000 (09:51 -0800)]
am af05c912: am a8c06116: Merge "Remove remnants of HWC 0.x"

* commit 'af05c912e1afa1f7d7b3f4b1d8b3034427abc37b':
  Remove remnants of HWC 0.x

11 years agoam a8c06116: Merge "Remove remnants of HWC 0.x"
Jesse Hall [Mon, 14 Jan 2013 17:49:11 +0000 (09:49 -0800)]
am a8c06116: Merge "Remove remnants of HWC 0.x"

* commit 'a8c061169752cbaf335a35e49568b7fe7d7e83cd':
  Remove remnants of HWC 0.x

11 years agoMerge "Remove remnants of HWC 0.x"
Jesse Hall [Mon, 14 Jan 2013 17:24:59 +0000 (09:24 -0800)]
Merge "Remove remnants of HWC 0.x"

11 years agoam efabd3c6: (-s ours) am 2dc781d2: Camera2: Tests: ModuleTests should not return...
Igor Murashkin [Fri, 11 Jan 2013 18:54:12 +0000 (10:54 -0800)]
am efabd3c6: (-s ours) am 2dc781d2: Camera2: Tests: ModuleTests should not return OK for bad indices: DO NOT MERGE

* commit 'efabd3c6c6c0e0ca0625dadf1d4a2ed00c2d0a21':
  Camera2: Tests: ModuleTests should not return OK for bad indices: DO NOT MERGE

11 years agoam 85f18a15: (-s ours) am 2d3c3e14: Camera2: Tests: Fix Camera2Test to be correct...
Igor Murashkin [Fri, 11 Jan 2013 18:54:12 +0000 (10:54 -0800)]
am 85f18a15: (-s ours) am 2d3c3e14: Camera2: Tests: Fix Camera2Test to be correct: DO NOT MERGE

* commit '85f18a15b1375c4d59b93f4dac1d4b5995854fe6':
  Camera2: Tests: Fix Camera2Test to be correct: DO NOT MERGE

11 years agoam 1af4dc05: (-s ours) am f32c9ea6: Camera2: Tests: Ignore V1 device initialization...
Igor Murashkin [Fri, 11 Jan 2013 18:54:11 +0000 (10:54 -0800)]
am 1af4dc05: (-s ours) am f32c9ea6: Camera2: Tests: Ignore V1 device initialization failures.: DO NOT MERGE

* commit '1af4dc058ef26804cc3617e1ec4a80cc9e1ad715':
  Camera2: Tests: Ignore V1 device initialization failures.: DO NOT MERGE

11 years agoam e5326c29: (-s ours) am 1f51808a: Camera2: Tests: Fix CameraFrameTests to pass...
Igor Murashkin [Fri, 11 Jan 2013 18:54:10 +0000 (10:54 -0800)]
am e5326c29: (-s ours) am 1f51808a: Camera2: Tests: Fix CameraFrameTests to pass instead of failing and hanging.: DO NOT MERGE

* commit 'e5326c296fe91b7ae7d43d00def34d22dc8e5771':
  Camera2: Tests: Fix CameraFrameTests to pass instead of failing and hanging.: DO NOT MERGE

11 years agoam 32b9b9ff: (-s ours) am d8875030: Camera2: Tests: Release streams after HAL is...
Igor Murashkin [Fri, 11 Jan 2013 18:54:09 +0000 (10:54 -0800)]
am 32b9b9ff: (-s ours) am d8875030: Camera2: Tests: Release streams after HAL is unloaded: DO NOT MERGE

* commit '32b9b9ff9ae2f367ad3626690d6ef1fd9339e423':
  Camera2: Tests: Release streams after HAL is unloaded: DO NOT MERGE

11 years agoam 5a6b76d2: (-s ours) am 2a5c0e2a: Camera2: Tests: Skip stream tests /w formats...
Igor Murashkin [Fri, 11 Jan 2013 18:54:08 +0000 (10:54 -0800)]
am 5a6b76d2: (-s ours) am 2a5c0e2a: Camera2: Tests: Skip stream tests /w formats that are not available.: DO NOT MERGE

* commit '5a6b76d2ae1e6da5929a6f475fada31b280a2360':
  Camera2: Tests: Skip stream tests /w formats that are not available.: DO NOT MERGE

11 years agoam be3b59c4: (-s ours) am ff4d762c: Camera2: Tests: Add CLI arguments for disabling...
Igor Murashkin [Fri, 11 Jan 2013 18:54:08 +0000 (10:54 -0800)]
am be3b59c4: (-s ours) am ff4d762c: Camera2: Tests: Add CLI arguments for disabling forking and changing camera ID: DO NOT MERGE

* commit 'be3b59c46e1fd6050bcc743202fcd6d109125701':
  Camera2: Tests: Add CLI arguments for disabling forking and changing camera ID: DO NOT MERGE

11 years agoam 3739a345: (-s ours) am afdd2b62: Camera2: Add a test for bursting 10 frames at...
Igor Murashkin [Fri, 11 Jan 2013 18:54:07 +0000 (10:54 -0800)]
am 3739a345: (-s ours) am afdd2b62: Camera2: Add a test for bursting 10 frames at a time /w manual exp controls: DO NOT MERGE

* commit '3739a345b688e89ae28145683c50590cc168b480':
  Camera2: Add a test for bursting 10 frames at a time /w manual exp controls: DO NOT MERGE

11 years agoam 16e5a644: (-s ours) am 4ac84a42: Camera2: Tests: Future-alias select metadata...
Igor Murashkin [Fri, 11 Jan 2013 18:54:06 +0000 (10:54 -0800)]
am 16e5a644: (-s ours) am 4ac84a42: Camera2: Tests: Future-alias select metadata symbols: DO NOT MERGE

* commit '16e5a6440f54b396219315bc27f49f103083393b':
  Camera2: Tests: Future-alias select metadata symbols: DO NOT MERGE

11 years agoam f6892043: (-s ours) am 919cf643: Camera2: Tests -- Fork each test before executing...
Igor Murashkin [Fri, 11 Jan 2013 18:54:04 +0000 (10:54 -0800)]
am f6892043: (-s ours) am 919cf643: Camera2: Tests -- Fork each test before executing it: DO NOT MERGE

* commit 'f68920430b5dd669f89e9a0f74b095229fddf42c':
  Camera2: Tests -- Fork each test before executing it: DO NOT MERGE

11 years agoam 4c4b2a91: (-s ours) am 7e38f5fa: Camera2: Automated tests for testing HAL2.0 inter...
Igor Murashkin [Fri, 11 Jan 2013 18:54:03 +0000 (10:54 -0800)]
am 4c4b2a91: (-s ours) am 7e38f5fa: Camera2: Automated tests for testing HAL2.0 interface: DO NOT MERGE

* commit '4c4b2a9120c59ed8172a0e94b4410e8f5c3143e3':
  Camera2: Automated tests for testing HAL2.0 interface: DO NOT MERGE

11 years agoRemove remnants of HWC 0.x
Jesse Hall [Fri, 11 Jan 2013 00:19:19 +0000 (16:19 -0800)]
Remove remnants of HWC 0.x

Change-Id: I85f4b95e8db44998abc07686a554d3e802a6a4a9

11 years agoam 2dc781d2: Camera2: Tests: ModuleTests should not return OK for bad indices: DO...
Igor Murashkin [Thu, 10 Jan 2013 21:37:15 +0000 (13:37 -0800)]
am 2dc781d2: Camera2: Tests: ModuleTests should not return OK for bad indices: DO NOT MERGE

* commit '2dc781d20e8321aada3e8f46f76414c8dd3229da':
  Camera2: Tests: ModuleTests should not return OK for bad indices: DO NOT MERGE

11 years agoam 2d3c3e14: Camera2: Tests: Fix Camera2Test to be correct: DO NOT MERGE
Igor Murashkin [Thu, 10 Jan 2013 21:37:14 +0000 (13:37 -0800)]
am 2d3c3e14: Camera2: Tests: Fix Camera2Test to be correct: DO NOT MERGE

* commit '2d3c3e145545f0920f38340a8702d39e5ae8a792':
  Camera2: Tests: Fix Camera2Test to be correct: DO NOT MERGE

11 years agoam f32c9ea6: Camera2: Tests: Ignore V1 device initialization failures.: DO NOT MERGE
Igor Murashkin [Thu, 10 Jan 2013 21:37:14 +0000 (13:37 -0800)]
am f32c9ea6: Camera2: Tests: Ignore V1 device initialization failures.: DO NOT MERGE

* commit 'f32c9ea6dfa86904fff4935ee0ffe989c4297b39':
  Camera2: Tests: Ignore V1 device initialization failures.: DO NOT MERGE

11 years agoam 1f51808a: Camera2: Tests: Fix CameraFrameTests to pass instead of failing and...
Igor Murashkin [Thu, 10 Jan 2013 21:37:13 +0000 (13:37 -0800)]
am 1f51808a: Camera2: Tests: Fix CameraFrameTests to pass instead of failing and hanging.: DO NOT MERGE

* commit '1f51808ad12e52b44097b4bbe0cfb454ed21687f':
  Camera2: Tests: Fix CameraFrameTests to pass instead of failing and hanging.: DO NOT MERGE

11 years agoam d8875030: Camera2: Tests: Release streams after HAL is unloaded: DO NOT MERGE
Igor Murashkin [Thu, 10 Jan 2013 21:37:12 +0000 (13:37 -0800)]
am d8875030: Camera2: Tests: Release streams after HAL is unloaded: DO NOT MERGE

* commit 'd887503095926eadfefefdc07fcedaff51e4f07d':
  Camera2: Tests: Release streams after HAL is unloaded: DO NOT MERGE

11 years agoam 2a5c0e2a: Camera2: Tests: Skip stream tests /w formats that are not available...
Igor Murashkin [Thu, 10 Jan 2013 21:37:11 +0000 (13:37 -0800)]
am 2a5c0e2a: Camera2: Tests: Skip stream tests /w formats that are not available.: DO NOT MERGE

* commit '2a5c0e2a466fe5252cd12c0199d4868efcc83264':
  Camera2: Tests: Skip stream tests /w formats that are not available.: DO NOT MERGE

11 years agoam ff4d762c: Camera2: Tests: Add CLI arguments for disabling forking and changing...
Igor Murashkin [Thu, 10 Jan 2013 21:37:11 +0000 (13:37 -0800)]
am ff4d762c: Camera2: Tests: Add CLI arguments for disabling forking and changing camera ID: DO NOT MERGE

* commit 'ff4d762c34e2f785a01f7d2253d746d0bcdc7aa4':
  Camera2: Tests: Add CLI arguments for disabling forking and changing camera ID: DO NOT MERGE

11 years agoam afdd2b62: Camera2: Add a test for bursting 10 frames at a time /w manual exp contr...
Igor Murashkin [Thu, 10 Jan 2013 21:37:10 +0000 (13:37 -0800)]
am afdd2b62: Camera2: Add a test for bursting 10 frames at a time /w manual exp controls: DO NOT MERGE

* commit 'afdd2b621140f90c2df1a161ed36e42caa2d26da':
  Camera2: Add a test for bursting 10 frames at a time /w manual exp controls: DO NOT MERGE

11 years agoam 4ac84a42: Camera2: Tests: Future-alias select metadata symbols: DO NOT MERGE
Igor Murashkin [Thu, 10 Jan 2013 21:37:09 +0000 (13:37 -0800)]
am 4ac84a42: Camera2: Tests: Future-alias select metadata symbols: DO NOT MERGE

* commit '4ac84a428d05ce7963f201df7ca308acb88fd8d8':
  Camera2: Tests: Future-alias select metadata symbols: DO NOT MERGE

11 years agoam 919cf643: Camera2: Tests -- Fork each test before executing it: DO NOT MERGE
Igor Murashkin [Thu, 10 Jan 2013 21:37:08 +0000 (13:37 -0800)]
am 919cf643: Camera2: Tests -- Fork each test before executing it: DO NOT MERGE

* commit '919cf643730fe7aacbbbaf014f2dfbf47521ecfa':
  Camera2: Tests -- Fork each test before executing it: DO NOT MERGE

11 years agoam 7e38f5fa: Camera2: Automated tests for testing HAL2.0 interface: DO NOT MERGE
Igor Murashkin [Thu, 10 Jan 2013 21:37:07 +0000 (13:37 -0800)]
am 7e38f5fa: Camera2: Automated tests for testing HAL2.0 interface: DO NOT MERGE

* commit '7e38f5faac9a8404bd13ea02cf136f1a69443715':
  Camera2: Automated tests for testing HAL2.0 interface: DO NOT MERGE

11 years agoCamera2: Tests: ModuleTests should not return OK for bad indices: DO NOT MERGE
Igor Murashkin [Fri, 21 Dec 2012 01:11:56 +0000 (17:11 -0800)]
Camera2: Tests: ModuleTests should not return OK for bad indices: DO NOT MERGE

Change-Id: Ie2a0558104c13fe881d90ababf66a54f810f12aa