Michael Wright
6f783602c0
Move inputflinger process to host directory
...
Change-Id: I08ee44bf8b93e7f1760ee9f8d9876a1e2e2e86c8
2015-02-23 16:04:57 -08:00
Elliott Hughes
4b2266daaa
am 6576937f: am 75b81aee: Merge "Add missing <sys/file.h> include for flock."
...
* commit '6576937ff165cfd8e2230cbeb40c6d783675c517':
Add missing <sys/file.h> include for flock.
2015-02-17 02:18:59 +00:00
Elliott Hughes
6576937ff1
am 75b81aee: Merge "Add missing <sys/file.h> include for flock."
...
* commit '75b81aee3830d0a8c7c10e3ca7f1652543dbbaca':
Add missing <sys/file.h> include for flock.
2015-02-17 01:38:59 +00:00
Elliott Hughes
75b81aee38
Merge "Add missing <sys/file.h> include for flock."
2015-02-17 01:24:49 +00:00
Elliott Hughes
2ead70ce67
Add missing <sys/file.h> include for flock.
...
Change-Id: I5c9bb4aa74d8a36d44e086bbcb5d60876727ce4c
2015-02-16 10:44:22 -08:00
Nick Vaccaro
fc35dd8bc9
am 26cc3d0b: am b9bb1f13: Merge "Add support for SENSOR_TYPE_WRIST_TILT_GESTURE" into lmp-mr1-modular-dev
...
* commit '26cc3d0b67ff4daf31eaeed0ecd87b391978aadb':
Add support for SENSOR_TYPE_WRIST_TILT_GESTURE
2015-02-11 20:12:12 +00:00
Lajos Molnar
af428d4ede
am 459c0b6d: am 9b6be8e1: Revert "omx: add Intel\'s SemiPlanar OMX color format that is used on some devices"
...
* commit '459c0b6d3693c6e7f29c538300cc78f64b8c318b':
Revert "omx: add Intel's SemiPlanar OMX color format that is used on some devices"
2015-02-11 20:12:10 +00:00
Nick Vaccaro
26cc3d0b67
am b9bb1f13: Merge "Add support for SENSOR_TYPE_WRIST_TILT_GESTURE" into lmp-mr1-modular-dev
...
* commit 'b9bb1f139bd1cbf3b3faa002b509f3f0a167e20b':
Add support for SENSOR_TYPE_WRIST_TILT_GESTURE
2015-02-11 20:04:42 +00:00
Lajos Molnar
459c0b6d36
am 9b6be8e1: Revert "omx: add Intel\'s SemiPlanar OMX color format that is used on some devices"
...
* commit '9b6be8e10b25f6f0bb949fec67b36fc773f5b591':
Revert "omx: add Intel's SemiPlanar OMX color format that is used on some devices"
2015-02-11 20:04:40 +00:00
Nick Vaccaro
b9bb1f139b
Merge "Add support for SENSOR_TYPE_WRIST_TILT_GESTURE" into lmp-mr1-modular-dev
2015-02-11 19:58:19 +00:00
Lajos Molnar
9b6be8e10b
Revert "omx: add Intel's SemiPlanar OMX color format that is used on some devices"
...
This reverts commit 61b17d64f90b85fd367ea1c7609cac69485957d4.
Bug: 19317169
Change-Id: Ib1fcc26c46a52c848ffa8238ddbf6abfe57cfa5d
2015-02-11 09:58:58 -08:00
Christopher Ferris
1d24efe4d3
am 34e32466: am 8511b3ae: Merge "Remove -z option."
...
* commit '34e32466466ad3f46697798c9f9644d62390c9b5':
Remove -z option.
2015-02-11 02:50:02 +00:00
Christopher Ferris
34e3246646
am 8511b3ae: Merge "Remove -z option."
...
* commit '8511b3ae5eb42810f97f7c3e993d7f80d3393b83':
Remove -z option.
2015-02-10 16:53:52 +00:00
Christopher Ferris
8511b3ae5e
Merge "Remove -z option."
2015-02-10 01:26:58 +00:00
Christopher Ferris
ff4a4dc7e6
Remove -z option.
...
This option doesn't work with the current selinux protections and
doesn't serve much of a purpose. You can get the same results running
this:
dumpstate | gzip > /data/local/tmp/dump.txt.gz
Bug: 19271141
Change-Id: Icc76200df33dc708e30c556ec8a0f393f995fe7c
2015-02-09 16:45:35 -08:00
Lajos Molnar
2f15949efc
am dac8c969: (-s ours) am d25be0ea: DO NOT MERGE: omx: add OMX_INTEL_COLOR_FormatYUV420PackedSemiPlanar
...
* commit 'dac8c96955488346697570db3769a029704f71ac':
DO NOT MERGE: omx: add OMX_INTEL_COLOR_FormatYUV420PackedSemiPlanar
2015-02-09 04:14:06 +00:00
Nick Vaccaro
9bb99b1570
Add support for SENSOR_TYPE_WRIST_TILT_GESTURE
...
Change-Id: I7e5516de805618df41de0f9b06805002e32708c3
2015-02-07 00:09:05 +00:00
Lajos Molnar
dac8c96955
am d25be0ea: DO NOT MERGE: omx: add OMX_INTEL_COLOR_FormatYUV420PackedSemiPlanar
...
* commit 'd25be0ea48c775e4038163b546c9553e294d4fdc':
DO NOT MERGE: omx: add OMX_INTEL_COLOR_FormatYUV420PackedSemiPlanar
2015-02-07 00:06:07 +00:00
Lajos Molnar
d25be0ea48
DO NOT MERGE: omx: add OMX_INTEL_COLOR_FormatYUV420PackedSemiPlanar
...
This seems to have the same layout as OMX_COLOR_FormatYUV420SemiPlanar,
but used under this value on some devices.
Bug: 19246722
Change-Id: Ib866024e52cf7b12608f02eefc43c6d58a1c0aa1
2015-02-06 19:26:50 +00:00
Lajos Molnar
c7f664a8c2
am 8f706b5d: am ea5da67d: add bUsingNativeBuffers to DescribeColorFormatParams
...
* commit '8f706b5ddb4aa15f123ecc7329670604284a2624':
add bUsingNativeBuffers to DescribeColorFormatParams
2015-02-04 20:54:16 +00:00
Lajos Molnar
8f706b5ddb
am ea5da67d: add bUsingNativeBuffers to DescribeColorFormatParams
...
* commit 'ea5da67d90647a1d4b395be51bf9cec218b98b71':
add bUsingNativeBuffers to DescribeColorFormatParams
2015-02-04 20:47:43 +00:00
Christopher Ferris
9368dadcbc
am 16c62c46: am 50ad67e4: Merge "Add better timeout mechanism for running commands."
...
* commit '16c62c468aacf40496a7cad94f49795a797cdd37':
Add better timeout mechanism for running commands.
2015-02-04 18:56:45 +00:00
Christopher Ferris
16c62c468a
am 50ad67e4: Merge "Add better timeout mechanism for running commands."
...
* commit '50ad67e4ce6b07b5f5f4649ace81ed9a8b2c2eac':
Add better timeout mechanism for running commands.
2015-02-04 02:08:44 +00:00
Christopher Ferris
50ad67e4ce
Merge "Add better timeout mechanism for running commands."
2015-02-04 01:57:13 +00:00
Christopher Ferris
1a9a338615
Add better timeout mechanism for running commands.
...
Change-Id: I60fc9e7d59c3e0e4b8b2f69f79c6903240bfd131
2015-02-03 14:53:44 -08:00
Ruben Brunk
a27e2f7179
Merge "Add ProcessInfoService to activity manager."
2015-02-03 20:23:14 +00:00
Ruben Brunk
52f0407d68
Add ProcessInfoService to activity manager.
...
- Adds a new AIDL interface for querying process
information from activity manager.
Bug: 19186859
Change-Id: Ic08858f346d6b66e7bfc9da6faa2c6e38d9b2e82
2015-02-02 14:56:55 -08:00
Elliott Hughes
312a9e6620
am 42b5e6d4: am 51bfedd8: Merge "Add missing includes."
...
* commit '42b5e6d49c92c3ec89fec7c68438a61e9e021e72':
Add missing includes.
2015-01-30 21:28:15 +00:00
Elliott Hughes
42b5e6d49c
am 51bfedd8: Merge "Add missing includes."
...
* commit '51bfedd821c79ae34ee1caffd9ae958faa71ecec':
Add missing includes.
2015-01-30 21:16:38 +00:00
Lajos Molnar
ea5da67d90
add bUsingNativeBuffers to DescribeColorFormatParams
...
This is needed to find proper color format for flex-YUV native
buffer support.
Bug: 19179927
Change-Id: I91ae6764e302c4307a0750c1d6820506d735c942
2015-01-30 12:02:20 -08:00
Elliott Hughes
51bfedd821
Merge "Add missing includes."
2015-01-30 06:34:37 +00:00
Elliott Hughes
824e30e5ed
Add missing includes.
...
Change-Id: I1dad32ab459c25063a70cf52100a29d00fea3a90
2015-01-29 22:32:32 -08:00
Lajos Molnar
b3ca72ce1e
CpuConsumer: fix build error
2015-01-29 10:55:21 -08:00
Chad Jones
bacce71e40
Merge commit 'ec41d55b8d018f349f7687cfe491651db600b51d'
2015-01-29 10:32:25 -08:00
Chad Jones
1bca4eeba1
Merge commit '180c2ba763c32793c6d3c5fe2683f8f2b233ca10'
2015-01-29 10:32:02 -08:00
Lajos Molnar
ec41d55b8d
am 94ee9b59: Merge "CpuConsumer: lock buffers that could be YUV as ycbcr" into lmp-mr1-dev
...
* commit '94ee9b5916903e6ee23bb1ce8f688900a4eb6f65':
CpuConsumer: lock buffers that could be YUV as ycbcr
2015-01-29 08:41:35 +00:00
Lajos Molnar
94ee9b5916
Merge "CpuConsumer: lock buffers that could be YUV as ycbcr" into lmp-mr1-dev
2015-01-29 07:53:58 +00:00
Lajos Molnar
180c2ba763
resolved conflicts for merge of 1f9f71e1
to lmp-mr1-dev-plus-aosp
...
Change-Id: I627e58fe738e9a3b9831508853f26f9adc350f90
2015-01-28 21:27:46 -08:00
Michael Lentine
9934f29b0d
resolved conflicts for merge of 2f1e3b4d
to master
...
Change-Id: I68dcde35fb57593140651df67d60f4cafac441dc
2015-01-28 17:22:35 -08:00
Lajos Molnar
6a26be7c2b
CpuConsumer: lock buffers that could be YUV as ycbcr
...
Bug: 17906609
Change-Id: Ic71af69ec3b19ab1224ed3ad5e0a97c60e81cda6
2015-01-28 16:52:43 -08:00
Lajos Molnar
1f9f71e183
GraphicBufferMapper: handle devices that do not implement lock_ycbcr
...
Bug: 19179927
Change-Id: I09ffca954fed3cd2d3466c8396627dc7dbc0052d
2015-01-28 16:26:36 -08:00
Michael Lentine
2f1e3b4d21
am d6fce7ab: Merge "Remove lock around ref count check in terminate." into lmp-mr1-dev
...
* commit 'd6fce7ab66e5d33e3ee16247485d1b8c26dd7ee8':
Remove lock around ref count check in terminate.
2015-01-28 22:38:42 +00:00
Michael Lentine
d6fce7ab66
Merge "Remove lock around ref count check in terminate." into lmp-mr1-dev
2015-01-28 22:23:06 +00:00
Michael Lentine
54466bc441
Remove lock around ref count check in terminate.
...
Replace the global lock in terminate for the ref count check with atomics and a
local lock.
Bug: 19072064
Change-Id: I0cfd6564e227a75b8387a8788b16381d5bc2cc88
2015-01-28 11:54:15 -08:00
Elliott Hughes
08741a02e9
am e55073a9: am 0e17a265: Merge "Switch dumpstate to "ip link list"."
...
* commit 'e55073a96ca7e9447592988614664b3c9666d93a':
Switch dumpstate to "ip link list".
2015-01-28 17:39:18 +00:00
Elliott Hughes
e55073a96c
am 0e17a265: Merge "Switch dumpstate to "ip link list"."
...
* commit '0e17a265f5e8bf233a3e3b74fc03ada3dc467bed':
Switch dumpstate to "ip link list".
2015-01-28 17:34:16 +00:00
Elliott Hughes
0e17a265f5
Merge "Switch dumpstate to "ip link list"."
2015-01-28 17:22:28 +00:00
Elliott Hughes
a59828a5d2
Switch dumpstate to "ip link list".
...
Change-Id: Ia1db51c866890f09fbd4316764dea5982554598f
2015-01-28 08:45:40 -08:00
Dan Stoza
3890c83721
am 40b4e23a: Merge "resolved conflicts for merge of 1665c8e1
to lmp-mr1-dev-plus-aosp" into lmp-mr1-dev-plus-aosp
...
* commit '40b4e23a0396614c841977e932218e3f53089a4a':
Revert "SurfaceFlinger: Attempt to attribute fds to layers"
2015-01-27 23:42:56 +00:00
Yabin Cui
3d6c569140
am 39d890d9: am 6e32c037: Merge "Kill HAVE_PTHREADS."
...
* commit '39d890d9aed5cb07b8a166a749299b9d24d8f137':
Kill HAVE_PTHREADS.
2015-01-27 23:42:55 +00:00