Ruben Brunk
a27e2f7179
Merge "Add ProcessInfoService to activity manager."
2015-02-03 20:23:14 +00: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
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
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
6d245d135c
am c7a7b118: am a46ff664: Merge "Use register numbers instead of register names"
...
* commit 'c7a7b118b501e82d98209ad64ddc18ac4ba404f7':
Use register numbers instead of register names
2015-01-26 17:45:42 +00: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
f58493b111
am 2e5a1cf2: am 346329b7: Merge "Move atrace from the obsolete bzero to memset."
...
* commit '2e5a1cf27ec7ba3ff64cae479ceb5670439470da':
Move atrace from the obsolete bzero to memset.
2015-01-25 21:00:55 +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
32ad13487a
am 3dea840d: am c0e10c6f: Merge "Refactor of the bugreport code."
...
* commit '3dea840d212429956144790189127b30d976bf63':
Refactor of the bugreport code.
2015-01-24 16:57:35 +00: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
f9967de38a
am 0cfe43a0: am f551e1c1: Merge "[MIPS] Further opengl support for mips64 and mipsr6"
...
* commit '0cfe43a0ad9ee43590c4f181662dc0d7d91e384d':
[MIPS] Further opengl support for mips64 and mipsr6
2015-01-22 19:39:26 +00:00
Dan Stoza
ba81a3b7b2
am 471ec6b4: libui: Add Rect(uint32_t, uint32_t)
...
* commit '471ec6b4284f645b5e933537fda88de867105fb2':
libui: Add Rect(uint32_t, uint32_t)
2015-01-22 19:39:26 +00: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
31bf9335ca
am e18155e1: am 4ecf6ec9: Merge "Restore Region::set(uint32_t, uint32_t)"
...
* commit 'e18155e1c68a2ccd8ed2eb86b7c8c8481747ac0c':
Restore Region::set(uint32_t, uint32_t)
2015-01-22 01:49:34 +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