OSDN Git Service
Matthew Xie [Thu, 18 Apr 2013 18:37:12 +0000 (11:37 -0700)]
am
b98207b0: am
47a0ead4: Merge "LE (1/3): Add application ID to connection callback" into jb-mr2-dev
* commit '
b98207b0b657f7a45f23ab11f89cff6987f6af15':
LE (1/3): Add application ID to connection callback
Matthew Xie [Thu, 18 Apr 2013 18:33:21 +0000 (11:33 -0700)]
am
47a0ead4: Merge "LE (1/3): Add application ID to connection callback" into jb-mr2-dev
* commit '
47a0ead467b563c97e2813c292e90f31e650c640':
LE (1/3): Add application ID to connection callback
Matthew Xie [Thu, 18 Apr 2013 18:31:12 +0000 (18:31 +0000)]
Merge "LE (1/3): Add application ID to connection callback" into jb-mr2-dev
Andre Eisenbach [Wed, 10 Apr 2013 18:18:03 +0000 (11:18 -0700)]
LE (1/3): Add application ID to connection callback
Bug:
8589393
Change-Id: I1c9d83b988cad71c5652ecf4025fdc6f650fff42
The Android Open Source Project [Mon, 15 Apr 2013 17:53:15 +0000 (10:53 -0700)]
am
231d515e: Reconcile with jb-mr2-release - do not merge
* commit '
231d515e861fe83ae12faeb8f3298cd1e332ebab':
The Android Open Source Project [Mon, 15 Apr 2013 17:46:15 +0000 (10:46 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Ic6e89b81ef0da701d1be72f10bf5f94cd26f4bf8
The Android Automerger [Mon, 15 Apr 2013 12:56:01 +0000 (05:56 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Yu Shan Emily Lau [Mon, 15 Apr 2013 01:36:58 +0000 (18:36 -0700)]
am
3589c0ef: am
827e137b: Merge "Update the test output path." into jb-mr2-dev
* commit '
3589c0ef736e3e5f0ee07f756cd83a5f7c281236':
Update the test output path.
Yu Shan Emily Lau [Mon, 15 Apr 2013 01:33:27 +0000 (18:33 -0700)]
am
827e137b: Merge "Update the test output path." into jb-mr2-dev
* commit '
827e137bb168a6cd77011e7a66a2a4250e25d800':
Update the test output path.
Yu Shan Emily Lau [Mon, 15 Apr 2013 01:30:02 +0000 (01:30 +0000)]
Merge "Update the test output path." into jb-mr2-dev
Yu Shan Emily Lau [Fri, 12 Apr 2013 21:50:20 +0000 (14:50 -0700)]
Update the test output path.
In order for the automated test to pick up the test.
The output must be in /data/nativetest.
Change-Id: I453805a1d186fec014e34b3d37a1e8bc62b2a5ac
The Android Open Source Project [Thu, 11 Apr 2013 14:50:51 +0000 (07:50 -0700)]
am
719842ff: Reconcile with jb-mr2-release - do not merge
* commit '
719842ffa78f9239fb737e909eb8dfe76cb8308b':
The Android Open Source Project [Thu, 11 Apr 2013 14:45:17 +0000 (07:45 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I6a6767350c2db72e397b4a7f39a1bf00db9560c0
The Android Automerger [Thu, 11 Apr 2013 12:55:44 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Eino-Ville Talvala [Wed, 10 Apr 2013 22:34:42 +0000 (15:34 -0700)]
am
37978d7c: am
9fafa4a3: Merge "Camera3: Allow many calls to process_capture_result per request" into jb-mr2-dev
* commit '
37978d7c62d00880552eb5022acde6380862213d':
Camera3: Allow many calls to process_capture_result per request
Eino-Ville Talvala [Wed, 10 Apr 2013 22:31:09 +0000 (15:31 -0700)]
am
9fafa4a3: Merge "Camera3: Allow many calls to process_capture_result per request" into jb-mr2-dev
* commit '
9fafa4a33d01f729078fb6800eaa951bb505e36a':
Camera3: Allow many calls to process_capture_result per request
Eino-Ville Talvala [Wed, 10 Apr 2013 22:27:57 +0000 (22:27 +0000)]
Merge "Camera3: Allow many calls to process_capture_result per request" into jb-mr2-dev
The Android Open Source Project [Wed, 10 Apr 2013 17:08:29 +0000 (10:08 -0700)]
am
32bd67c4: Reconcile with jb-mr2-release - do not merge
* commit '
32bd67c444d7ecfeaac961b73069c413f59fc7a6':
The Android Open Source Project [Wed, 10 Apr 2013 17:05:46 +0000 (10:05 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Id2611195c2e18dc743298976a1f97ecba1924974
The Android Automerger [Wed, 10 Apr 2013 12:56:21 +0000 (05:56 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Ying Wang [Wed, 10 Apr 2013 06:25:12 +0000 (23:25 -0700)]
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
Eino-Ville Talvala [Wed, 3 Apr 2013 22:18:20 +0000 (15:18 -0700)]
Camera3: Allow many calls to process_capture_result per request
Allow the HAL to split the capture result across multiple calls to
process_capture_result, so that when the sync framework cannot be
used, some output buffers can still be returned later than others.
Change-Id: Iea7f77a3d28daac3a94045ab4566f677aa53a7f9
The Android Open Source Project [Mon, 8 Apr 2013 20:40:41 +0000 (13:40 -0700)]
am
01b166e9: Reconcile with jb-mr2-release - do not merge
* commit '
01b166e97a6738ec7769c17102f5d6e9f9be96fa':
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:12:49 +0000 (21:12 -0700)]
am
72eced94: am
52feb4b1: Merge "Sensor HAL updates" into jb-mr2-dev
* commit '
72eced942fc8a3ab7112b23c678239511486865e':
Sensor HAL updates
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:43:23 +0000 (15:43 -0700)]
am
a061d6c5: am
aea9926c: Merge "Log when creating a second buffer mapping in a process" into jb-mr2-dev
* commit '
a061d6c51c4e99a8cbe471da75a343d8ccfa7ebc':
Log when creating a second buffer mapping in a process
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 [Thu, 4 Apr 2013 01:05:29 +0000 (18:05 -0700)]
am
a43c45b2: Reconcile with jb-mr2-release - do not merge
* commit '
a43c45b22b67d913c9879f29ec6d51c2128fba7f':
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 Open Source Project [Tue, 2 Apr 2013 18:04:13 +0000 (11:04 -0700)]
am
d94460c0: Reconcile with jb-mr2-release - do not merge
* commit '
d94460c0b1dc0dbf15511108c58d594f210317d5':
Ravi Nagarajan [Tue, 2 Apr 2013 18:03:42 +0000 (11:03 -0700)]
am
41eb2ff5: am
ebb8c1b8: Set max RC attribute count to 7
* commit '
41eb2ff581400efe8116baa41910c1f5d7088202':
Set max RC attribute count to 7
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:42:38 +0000 (09:42 -0700)]
am
8432e902: am
6ae9f704: Merge "Camera3: Documentation additions" into jb-mr2-dev
* commit '
8432e902c29e33c862c0d99d26d520cf050602c4':
Camera3: Documentation additions
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 21:35:32 +0000 (14:35 -0700)]
am
55bfb222: am
d44e4a94: Merge "Gps geofence." into jb-mr2-dev
* commit '
55bfb2227e2c7a8d9316a87d21e8938e971496f5':
Gps geofence.
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:50:37 +0000 (09:50 -0700)]
am
45f2cf94: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
45f2cf946b6556f6115fb5afadee17e2b1986bba':
Remove pid check in register/unregister
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:28:33 +0000 (14:28 -0700)]
am
d5dc0358: am
86b03c2f: Merge "Remove pid check in register/unregister" into jb-mr2-dev
* commit '
d5dc035885a8130c24d914f556b6265bd2d6ad3f':
Remove pid check in register/unregister
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:46:06 +0000 (15:46 -0700)]
am
72757ade: am
fb40d5de: camera2_test: Allow for HAL2 version >= 2.0 (i.e. 2.1, 3.0, etc)
* commit '
72757adef93fc5f353e163dba882c88ba3f40ef7':
camera2_test: Allow for HAL2 version >= 2.0 (i.e. 2.1, 3.0, etc)
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:22:13 +0000 (23:22 +0000)]
am
8916da1b: am
e1c3ff66: Merge "camera_common.h: Add STATUS_ENUMERATING enum" into jb-mr2-dev
* commit '
8916da1bdfe129be10109eb2565887bc84d99dc0':
camera_common.h: Add STATUS_ENUMERATING enum
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:52:53 +0000 (16:52 +0000)]
am
6ad7d420: am
bf94f90c: Merge "Initial version of RC HAL for AVRCP 1.3" into jb-mr2-dev
* commit '
6ad7d4203d5f7177b87a051eb109277f9bcc6b20':
Initial version of RC HAL for AVRCP 1.3
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:05:46 +0000 (19:05 +0000)]
am
a66180b7: am
ad186ba6: Merge "Camera: Minor fixes to camera3 HAL interface" into jb-mr2-dev
* commit '
a66180b7040fbe19f2befdb93ddda14b91a7de65':
Camera: Minor fixes to camera3 HAL interface
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:56:35 +0000 (19:56 +0000)]
am
09b4dc3d: (-s ours) 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 '
09b4dc3d0a48af9bb5c2313baffc482bef7c041d':
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:02:01 +0000 (02:02 +0000)]
am
64a35290: am
aa54f436: Merge "libhardware: Add camera_info typedef" into jb-mr2-dev
* commit '
64a35290badfdd4537e12f74d63649624d780b9a':
libhardware: Add camera_info typedef
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:33:57 +0000 (20:33 +0000)]
am
7e9490ed: am
2e7d3cd8: Minor fix in significant motion description
* commit '
7e9490ed724963a931d11b4b41956362d8a33800':
Minor fix in significant motion description
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:38:33 +0000 (18:38 +0000)]
am
eee64fb4: am
435e4a2b: Merge "Add significant motion description" into jb-mr2-dev
* commit '
eee64fb4b2b48f2e3d715b9ccc1c36b24a30b33f':
Add significant motion description
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
Brian Swetland [Thu, 7 Mar 2013 01:16:31 +0000 (17:16 -0800)]
hwcomposer commandline test(s)
Add cnativewindow which provides a minimal bridge between EGL and hwcomposer or fbhal.
Add test-arrows, a trivial GLES2 test program to exercise this.
Change-Id: I60ece4378def6b6eda55437c215fc46a180ad7a3
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:33:06 +0000 (21:33 +0000)]
am
f17f7217: am
3ba9dcb1: Merge "Camera: Fix incorrect pointer types" into jb-mr2-dev
* commit '
f17f7217cd213f5c8356160bdfc2c804485c82c4':
Camera: Fix incorrect pointer types
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:29:28 +0000 (23:29 +0000)]
am
f83c75ff: am
ca858143: Sensors HAL iterative update for jb-mr2
* commit '
f83c75ff54e0864382c1df8ba0b57e6a929974fb':
Sensors HAL iterative update for jb-mr2
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