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
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
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
8f706b5ddb
am ea5da67d
: add bUsingNativeBuffers to DescribeColorFormatParams
...
* commit 'ea5da67d90647a1d4b395be51bf9cec218b98b71':
add bUsingNativeBuffers to DescribeColorFormatParams
2015-02-04 20:47:43 +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
Duane Sand
ecacc3f164
[MIPS] Fix mips32r1 build
...
Fix regression from 6701fbe5f0
.
The rdhwr instruction is unsupported by mips32r1 cpus, but is
supported via kernel emulation on those cpus.
Change-Id: Ieb3343fff0f0da54003044f451c90e1c761208eb
2015-02-02 16:54:15 -08: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
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
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
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
40b4e23a03
Merge "resolved conflicts for merge of 1665c8e1
to lmp-mr1-dev-plus-aosp" into lmp-mr1-dev-plus-aosp
2015-01-27 20:06:34 +00:00
Yabin Cui
39d890d9ae
am 6e32c037
: Merge "Kill HAVE_PTHREADS."
...
* commit '6e32c0377db89bafa477715b3a02431d651978cf':
Kill HAVE_PTHREADS.
2015-01-27 19:56:06 +00:00
Dan Stoza
22d0bdf326
resolved conflicts for merge of 1665c8e1
to lmp-mr1-dev-plus-aosp
...
Change-Id: I0be2ecb8085f2cd9560138460bcc27d71c011608
2015-01-27 11:49:26 -08:00
Yabin Cui
6e32c0377d
Merge "Kill HAVE_PTHREADS."
2015-01-27 19:46:54 +00:00
Dan Stoza
1665c8e101
Revert "SurfaceFlinger: Attempt to attribute fds to layers"
...
This reverts commit 03eccb6616
.
Change-Id: I4f0da7bb62bf77bb3d399aee601beae5e03928fe
2015-01-27 11:03:50 -08:00
Yabin Cui
8fb2d25ff3
Kill HAVE_PTHREADS.
...
Bug: 19083585
Change-Id: I355491de945590f43c82bdcb7968b01b4bff6e06
2015-01-26 22:36:36 -08:00
Jesse Hall
c7a7b118b5
am a46ff664
: Merge "Use register numbers instead of register names"
...
* commit 'a46ff664571465b7a2741bed4225d30b5bf07503':
Use register numbers instead of register names
2015-01-26 17:39:55 +00:00
Jesse Hall
a46ff66457
Merge "Use register numbers instead of register names"
2015-01-26 17:17:08 +00:00
Elliott Hughes
2e5a1cf27e
am 346329b7
: Merge "Move atrace from the obsolete bzero to memset."
...
* commit '346329b7a70b594895be0aec5dc00f9f4108b533':
Move atrace from the obsolete bzero to memset.
2015-01-25 20:43:27 +00:00
Elliott Hughes
346329b7a7
Merge "Move atrace from the obsolete bzero to memset."
2015-01-25 19:17:14 +00:00
Elliott Hughes
3da5d235da
Move atrace from the obsolete bzero to memset.
...
(This file wasn't including <strings.h> for bzero or <string.h> for memset.)
Change-Id: Icef0e0dbfd36ebd21058cfd8c747e0a17aee8308
2015-01-25 08:35:20 -08:00
Christopher Ferris
3dea840d21
am c0e10c6f
: Merge "Refactor of the bugreport code."
...
* commit 'c0e10c6f03eaa126aeb745e0b209ad0b219ade6e':
Refactor of the bugreport code.
2015-01-23 23:12:16 +00:00
Christopher Ferris
c0e10c6f03
Merge "Refactor of the bugreport code."
2015-01-23 23:01:29 +00:00
Christopher Ferris
9b73bf07d7
Refactor of the bugreport code.
...
Implemented these changes:
- Make this code C++.
- Avoid hangs by adding a timeout.
- Add the necessary TEMP_FAILURE_RETRY calls.
- Restructure the code a bit.
Bug: 18800936
Change-Id: Iba9f86a4c7beee4f0f36e51234855f4c0834db47
2015-01-23 13:40:56 -08:00
Jesse Hall
0cfe43a0ad
am f551e1c1
: Merge "[MIPS] Further opengl support for mips64 and mipsr6"
...
* commit 'f551e1c1a59ae7ac906e2b204c3704d0dbf926a8':
[MIPS] Further opengl support for mips64 and mipsr6
2015-01-22 18:50:55 +00:00
Jesse Hall
f551e1c1a5
Merge "[MIPS] Further opengl support for mips64 and mipsr6"
2015-01-22 16:55:05 +00:00
Dan Stoza
471ec6b428
libui: Add Rect(uint32_t, uint32_t)
...
Adds a Rect constructor that takes uint32_t instead of int32_t, as
required by a change to Region and -Werror
Change-Id: If91915e5b4ec9ce9e7ba0fb84f03b045d000b023
2015-01-21 17:39:13 -08:00
Dan Stoza
e18155e1c6
am 4ecf6ec9
: Merge "Restore Region::set(uint32_t, uint32_t)"
...
* commit '4ecf6ec932644b680d5e13791275dd3bc1a1ee6d':
Restore Region::set(uint32_t, uint32_t)
2015-01-22 00:13:22 +00:00
Dan Stoza
4ecf6ec932
Merge "Restore Region::set(uint32_t, uint32_t)"
2015-01-21 16:39:22 +00:00
Nikola Veljkovic
5f5f65183c
Use register numbers instead of register names
...
Avoid ambiguity by using register numbers. Register names are
interpreted depending on the ABI. Fixes the issue with mips64 gcc,
where registers t0-t4 are translated into $8-$11 (o32 ABI) instead
of $12-$15 (o64 ABI).
Also, use t9 ($25) for storing function address
(in getProcAddress.cpp).
Change-Id: I12ef5cd98bf14dab3c01f2756889cc02856c1cd8
2015-01-19 15:58:32 +01:00
Duane Sand
6701fbe5f0
[MIPS] Further opengl support for mips64 and mipsr6
...
Combines 4 patches by Dragoslav and Douglas:
Use t9 to hold the address of the called function.
Add support for gl binding.
Fix inline assembly code to be R6 compatible.
Fix some more inline assembly code to be R6 compatible.
Change-Id: I0b899813790b2ba4ca538bb21692014cc1933f66
2015-01-19 11:54:46 +01:00
Dan Stoza
a5cbb1f18b
am ef1c17ae
: SurfaceFlinger: Make log message 64-bit compatible
...
* commit 'ef1c17ae9417abc1e21e49dbc629e448efc947dc':
SurfaceFlinger: Make log message 64-bit compatible
2015-01-17 00:50:53 +00:00
Dan Stoza
3372cc25df
resolved conflicts for merge of 03eccb66
to lmp-mr1-dev-plus-aosp
...
Change-Id: I1f38cbe7019b2b48b1094dee154ad97c23fd22c2
2015-01-16 16:18:51 -08:00