OSDN Git Service
Ying Wang [Wed, 10 Apr 2013 05:28:59 +0000 (22:28 -0700)]
Ying Wang [Wed, 10 Apr 2013 04:57:28 +0000 (21:57 -0700)]
Add liblog
Bug:
8580410
Change-Id: I24645233148f70c57d2f2b3a46952cb2a1aea9ba
The Android Open Source Project [Mon, 8 Apr 2013 20:36:10 +0000 (13:36 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Ifaae267f3be9b1bf759f6093eb331c2751b2565f
The Android Automerger [Mon, 8 Apr 2013 12:56:29 +0000 (05:56 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Etienne Le Grand [Fri, 5 Apr 2013 04:09:09 +0000 (21:09 -0700)]
am
52feb4b1: Merge "Sensor HAL updates" into jb-mr2-dev
* commit '
52feb4b1149692d9c95ef599f0086f2391567952':
Sensor HAL updates
Etienne Le Grand [Fri, 5 Apr 2013 04:05:39 +0000 (04:05 +0000)]
Merge "Sensor HAL updates" into jb-mr2-dev
Jesse Hall [Thu, 4 Apr 2013 22:40:03 +0000 (15:40 -0700)]
am
aea9926c: Merge "Log when creating a second buffer mapping in a process" into jb-mr2-dev
* commit '
aea9926cc9d0a789e15dfb9c806623a984a6e0ee':
Log when creating a second buffer mapping in a process
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
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
The Android Open Source Project [Wed, 3 Apr 2013 23:43:32 +0000 (16:43 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I167ac654d401f20613e517efd47651ca7ac538d9
The Android Automerger [Tue, 2 Apr 2013 16:18:57 +0000 (09:18 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Open Source Project [Tue, 2 Apr 2013 15:39:38 +0000 (08:39 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: If21f7033e2a70c260e2d388eab07b0eff1f8338c
Ravi Nagarajan [Tue, 2 Apr 2013 15:24:24 +0000 (08:24 -0700)]
am
ebb8c1b8: Set max RC attribute count to 7
* commit '
ebb8c1b8f6f3ae0155262426ffe0e57845d068c6':
Set 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
Eino-Ville Talvala [Mon, 1 Apr 2013 16:40:47 +0000 (09:40 -0700)]
am
6ae9f704: Merge "Camera3: Documentation additions" into jb-mr2-dev
* commit '
6ae9f7049cd6cbfb6b6218b280d451b621417c0e':
Camera3: Documentation additions
Eino-Ville Talvala [Mon, 1 Apr 2013 16:39:20 +0000 (16:39 +0000)]
Merge "Camera3: Documentation additions" into jb-mr2-dev
The Android Automerger [Mon, 1 Apr 2013 12:55:55 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
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
Jaikumar Ganesh [Fri, 29 Mar 2013 19:00:11 +0000 (12:00 -0700)]
am
d44e4a94: Merge "Gps geofence." into jb-mr2-dev
* commit '
d44e4a94de9708a5c0f648baf2309fe5fc0879bd':
Gps geofence.
Jaikumar Ganesh [Fri, 29 Mar 2013 18:58:44 +0000 (18:58 +0000)]
Merge "Gps geofence." into jb-mr2-dev
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
The Android Open Source Project [Fri, 29 Mar 2013 16:49:10 +0000 (09:49 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I9b949862f875d719438a833d702dc17a356eac08
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
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
Jesse Hall [Thu, 28 Mar 2013 21:26:48 +0000 (14:26 -0700)]
am
86b03c2f: Merge "Remove pid check in register/unregister" into jb-mr2-dev
* commit '
86b03c2f6578bfd78580dc02fb1a167b21dbceaf':
Remove pid check in register/unregister
Jesse Hall [Thu, 28 Mar 2013 21:24:55 +0000 (21:24 +0000)]
Merge "Remove pid check in register/unregister" into jb-mr2-dev
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
Igor Murashkin [Wed, 27 Mar 2013 22:44:56 +0000 (15:44 -0700)]
am
fb40d5de: camera2_test: Allow for HAL2 version >= 2.0 (i.e. 2.1, 3.0, etc)
* commit '
fb40d5de36fc93a1a3cab9c2cd73988ac52043a2':
camera2_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
Igor Murashkin [Thu, 21 Mar 2013 23:20:28 +0000 (23:20 +0000)]
am
e1c3ff66: Merge "camera_common.h: Add STATUS_ENUMERATING enum" into jb-mr2-dev
* commit '
e1c3ff664170ecfb92dab4c2d064c5e3ac3c4fcc':
camera_common.h: Add STATUS_ENUMERATING enum
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
Igor Murashkin [Mon, 18 Mar 2013 20:30:14 +0000 (13:30 -0700)]
camera_common.h: Add STATUS_ENUMERATING enum
Change-Id: I0986d37364a2666d493cb771fa76967aa051ca5d
Zhihai Xu [Thu, 21 Mar 2013 16:50:17 +0000 (16:50 +0000)]
am
bf94f90c: Merge "Initial version of RC HAL for AVRCP 1.3" into jb-mr2-dev
* commit '
bf94f90cdc53136d11d4722616ed032519501732':
Initial version of RC HAL for AVRCP 1.3
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
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
Eino-Ville Talvala [Thu, 14 Mar 2013 19:02:55 +0000 (19:02 +0000)]
am
ad186ba6: Merge "Camera: Minor fixes to camera3 HAL interface" into jb-mr2-dev
* commit '
ad186ba61c77a4f978ee365ad5b063d69fd48c9a':
Camera: Minor fixes to camera3 HAL interface
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
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
Jean-Baptiste Queru [Mon, 11 Mar 2013 19:47:21 +0000 (19:47 +0000)]
am
0e9d232b: am
1d0c7e05: am
6e5236ee: am
5c8f84a1: am
3a18bccc: (-s ours) am
431cd416: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
0e9d232b670f14e70e68ff43bc7154d95a757e0a':
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':
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':
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':
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':
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':
Jean-Baptiste Queru [Mon, 11 Mar 2013 19:20:12 +0000 (12:20 -0700)]
Reconcile with jb-mr1-release - do not merge
Alex Ray [Fri, 8 Mar 2013 02:00:09 +0000 (02:00 +0000)]
am
aa54f436: Merge "libhardware: Add camera_info typedef" into jb-mr2-dev
* commit '
aa54f436cdafec3594c93525339ca39c87c729d0':
libhardware: Add camera_info typedef
Alex Ray [Fri, 8 Mar 2013 01:58:30 +0000 (01:58 +0000)]
Merge "libhardware: Add camera_info typedef" into jb-mr2-dev
Etienne Le Grand [Thu, 7 Mar 2013 20:32:08 +0000 (20:32 +0000)]
am
2e7d3cd8: Minor fix in significant motion description
* commit '
2e7d3cd8a8bc6c4d1b977d7b08da605da36c181b':
Minor 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
Etienne Le Grand [Thu, 7 Mar 2013 18:35:18 +0000 (18:35 +0000)]
am
435e4a2b: Merge "Add significant motion description" into jb-mr2-dev
* commit '
435e4a2b04d889d9f8505b755fbdfc84715e348a':
Add significant motion description
Etienne Le Grand [Thu, 7 Mar 2013 18:34:08 +0000 (18:34 +0000)]
Merge "Add significant motion description" into jb-mr2-dev
Etienne Le Grand [Wed, 6 Mar 2013 06:00:33 +0000 (22:00 -0800)]
Add significant motion description
Change-Id: I56de3f2c12243b3d25cd825b66f7685e674533ff
Eino-Ville Talvala [Wed, 6 Mar 2013 21:31:01 +0000 (21:31 +0000)]
am
3ba9dcb1: Merge "Camera: Fix incorrect pointer types" into jb-mr2-dev
* commit '
3ba9dcb180ac8e01c513b1790cd0cad0f46b887f':
Camera: Fix incorrect pointer types
Eino-Ville Talvala [Wed, 6 Mar 2013 21:28:52 +0000 (21:28 +0000)]
Merge "Camera: Fix incorrect pointer types" into jb-mr2-dev
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
Alex Ray [Thu, 7 Feb 2013 23:44:24 +0000 (15:44 -0800)]
libhardware: Add camera_info typedef
Change-Id: I67ce80c886723d4dba7f799b6b135aa7026c2187
Etienne Le Grand [Tue, 5 Mar 2013 23:27:13 +0000 (23:27 +0000)]
am
ca858143: Sensors HAL iterative update for jb-mr2
* commit '
ca8581433b778c60b074839baa6c3f2233c09614':
Sensors 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
Alex Ray [Fri, 1 Mar 2013 20:15:44 +0000 (20:15 +0000)]
am
1f8af678: modules: camera: make Camera object id const
* commit '
1f8af678c9ef28090fad3dcb13eec84aab499ac7':
modules: 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
Ganesh Ganapathi Batta [Thu, 28 Feb 2013 18:46:18 +0000 (18:46 +0000)]
am
fefb3343: Initial version of BLE support for Bluedroid
* commit '
fefb3343906fe73c827d1b9d50cb3c451602c514':
Initial 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
Alex Ray [Wed, 27 Feb 2013 16:10:16 +0000 (16:10 +0000)]
am
a0ed4bea: modules: camera: Camera v3 Devices
* commit '
a0ed4bead4d7a9b9031f7cefe0ef49a951443461':
modules: 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
Alex Ray [Wed, 27 Feb 2013 06:48:58 +0000 (06:48 +0000)]
am
819cfd87: modules: camera: Update to v2.1 camera module API
* commit '
819cfd87bad560fbd89747371088ad35aaef8d43':
modules: 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
Alex Ray [Tue, 26 Feb 2013 23:19:42 +0000 (23:19 +0000)]
am
bb13a323: modules: camera: Hide HAL symbols DO NOT MERGE
* commit '
bb13a3231d24bf640e7060fee3a18643f7a9f0db':
modules: 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: Ibf25d29f2fb3760e7f586e62732614f167d39674
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
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
Alex Ray [Fri, 22 Feb 2013 21:06:52 +0000 (21:06 +0000)]
Merge "camera3: remove redundant hardware error condition"
Igor Murashkin [Fri, 22 Feb 2013 19:29:01 +0000 (19:29 +0000)]
Merge "Tests: Camera: Refactor CameraMetadata into frameworks/av"
Igor Murashkin [Fri, 22 Feb 2013 19:29:01 +0000 (19:29 +0000)]
Merge "Tests: Camera2: Add Y8/Y16 to Stream create/delete tests"
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
Igor Murashkin [Thu, 14 Feb 2013 01:33:36 +0000 (17:33 -0800)]
Tests: Camera: Refactor CameraMetadata into frameworks/av
Change-Id: Ibc2917a18163f07b5e37eb83abb3d1ef919a5766
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
Jaikumar Ganesh [Thu, 21 Feb 2013 22:56:20 +0000 (22:56 +0000)]
Merge "Revert "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.
Jaikumar Ganesh [Thu, 21 Feb 2013 22:42:49 +0000 (22:42 +0000)]
Merge "Add 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
Eino-Ville Talvala [Tue, 19 Feb 2013 18:23:54 +0000 (18:23 +0000)]
Merge "WIP: Camera HAL module 2.1, device 2.1"
Mathias Agopian [Fri, 15 Feb 2013 22:27:15 +0000 (14:27 -0800)]
fix build: SurfaceTextureClient to Surface rename
Change-Id: I8b4bbccc570ddfaaad6f7eeaa72edde05a720b35
Alex Ray [Fri, 15 Feb 2013 21:47:24 +0000 (13:47 -0800)]
camera3: remove redundant hardware error condition
Change-Id: I8cc538f82cf42972cc4d7cb155539222c41b4e0a
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
Mathias Agopian [Fri, 15 Feb 2013 01:34:35 +0000 (17:34 -0800)]
Refactoring: Rename SurfaceTextureClient to Surface
Change-Id: Iff197c557c06673a1ad85a9bbd36caa38efb88b7
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
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
Alex Ray [Thu, 14 Feb 2013 01:12:52 +0000 (17:12 -0800)]
Revert "libhardware: Add camera_info typedef"
This reverts commit
71cb21980a8f6a7ab3b5f86b6d81e8584769f489.
Alex Ray [Wed, 13 Feb 2013 23:58:41 +0000 (23:58 +0000)]
Merge "libhardware: Add camera_info typedef"
Eric Laurent [Mon, 11 Feb 2013 23:51:28 +0000 (23:51 +0000)]
Merge "audio effects: fix link problem with NULL UUID"
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
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
Alex Ray [Thu, 7 Feb 2013 23:44:24 +0000 (15:44 -0800)]
libhardware: Add camera_info typedef
Change-Id: Icfc0b2dc7739313a6266938f0e2b46fa823ba61e
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
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
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
Mathias Agopian [Wed, 30 Jan 2013 02:57:48 +0000 (18:57 -0800)]
add support for plane-alpha in HWC
Change-Id: Ied228e689ca892c505fbd811fd2b8579287e4ac6
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
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
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