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
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
Dan Stoza
ef1c17ae94
SurfaceFlinger: Make log message 64-bit compatible
...
Fixes the build on 64-bit targets that complain about using a size_t
with a %d in a format string
Change-Id: I7dfcd3a49eb0dbc5dffeb82bb7208de7f7925f08
2015-01-16 15:58:13 -08:00
Dan Stoza
03eccb6616
SurfaceFlinger: Attempt to attribute fds to layers
...
This tracks fds when layers are created and destroyed in an effort to
determine which specific app (if any) is active when fds are leaked
Bug: 19017008
Change-Id: I1f1d5a9cbc1399e3df3a2d350324f80b3a4e3477
2015-01-16 15:02:22 -08:00
Jeff Sharkey
499127eab8
am 8f3ade0c: Merge "Follow StrictMode refactoring."
...
* commit '8f3ade0c9ab52a1e4f13d6ff1922dd98e3ccdbcc':
Follow StrictMode refactoring.
2015-01-16 06:07:31 +00:00
Jeff Sharkey
8f3ade0c9a
Merge "Follow StrictMode refactoring."
2015-01-16 01:10:52 +00:00
Christopher Ferris
e52299e76e
am 1d463883: Merge "Use the timeout stack dump functions."
...
* commit '1d4638838aa09b157a68cb3580b8194f8736b880':
Use the timeout stack dump functions.
2015-01-15 23:51:57 +00:00
Christopher Ferris
1d4638838a
Merge "Use the timeout stack dump functions."
2015-01-15 23:40:39 +00:00
Christopher Ferris
31ef85529d
Use the timeout stack dump functions.
...
Use the native stack dumping functions that allows time outs. If
debuggerd locks up, before a bugreport would hang forever. Now
it will timeout properly and still get all of the other information.
Bug: 18766581
(cherry picked from commit 457731f69e
2015-01-15 15:35:40 -08:00
Jeff Davidson
b9b86f644f
am 4df903db: Merge "Revert "Revert "Update protobuf library from 2.3 to 2.6."""
...
* commit '4df903dbc71c48e2db6fae9390795b81782470b4':
Revert "Revert "Update protobuf library from 2.3 to 2.6.""
2015-01-15 23:02:01 +00:00
Jeff Davidson
4df903dbc7
Merge "Revert "Revert "Update protobuf library from 2.3 to 2.6."""
2015-01-15 22:49:02 +00:00
Christopher Ferris
8d129cbf5a
am 457731f6: Use the timeout stack dump functions.
...
* commit '457731f69e3106b5aae8fc04f9565af1d875876c':
Use the timeout stack dump functions.
2015-01-15 01:52:14 +00:00
Christopher Ferris
40a206b867
am d195f87b: Fix message when a command times out.
...
* commit 'd195f87b2dd4aa731a21ef3acd321e2441c5bffb':
Fix message when a command times out.
2015-01-15 01:39:17 +00:00
Christopher Ferris
457731f69e
Use the timeout stack dump functions.
...
Use the native stack dumping functions that allows time outs. If
debuggerd locks up, before a bugreport would hang forever. Now
it will timeout properly and still get all of the other information.
Bug: 18766581
Change-Id: I85053b8dcfe6224e2b64b4d8f7f2ef448b3cda34
2015-01-14 16:58:55 -08:00
Christopher Ferris
d195f87b2d
Fix message when a command times out.
...
The previous version printed out the nanoseconds elapsed, not seconds.
Bug: 18766581
(cherry picked from commit 67c5a8af9e
2015-01-14 16:10:11 -08:00
Jeff Sharkey
0c1f5cbb8a
Follow StrictMode refactoring.
...
Bug: 18335678
Change-Id: Iea920cfa26b5ebfd77b4601c9e6e65b21599342a
2015-01-14 10:58:52 -08:00
Riley Andrews
15411a00e1
am aec92242: Merge "Replace all instances of intptr_t with uintptr_t."
...
* commit 'aec922426620804768f00a6c5cb902f278f2967f':
Replace all instances of intptr_t with uintptr_t.
2015-01-13 23:26:02 +00:00
Riley Andrews
d66ba5209a
am 41a160c4: Merge "Fix signed/unsigned comparison warnings in driver interface test."
...
* commit '41a160c4cda1ef2c916028ec2d0801da738b5249':
Fix signed/unsigned comparison warnings in driver interface test.
2015-01-13 23:26:01 +00:00
Riley Andrews
aec9224266
Merge "Replace all instances of intptr_t with uintptr_t."
2015-01-13 22:06:05 +00:00
Riley Andrews
41a160c4cd
Merge "Fix signed/unsigned comparison warnings in driver interface test."
2015-01-13 22:00:24 +00:00
Riley Andrews
29d8cf91be
Replace all instances of intptr_t with uintptr_t.
...
When compiling 32 bit binaries against a 64 bit binder interface,
implicit promotions of intptr_t types to uint64_t for fields in the
binder ioctl structures can result in invalid pointers because of sign
extension.
2015-01-13 21:59:44 +00:00
Brian Carlstrom
a198e1c14d
am 6f9c6541: Merge "[MIPS] Build libGLES for mips64, mips32r6"
...
* commit '6f9c6541b77b18a6922d1f50326faa9ec6ed6d2a':
[MIPS] Build libGLES for mips64, mips32r6
2015-01-13 06:27:45 +00:00
Brian Carlstrom
6f9c6541b7
Merge "[MIPS] Build libGLES for mips64, mips32r6"
2015-01-13 06:19:37 +00:00
Duane Sand
81c6d66a1d
[MIPS] Build libGLES for mips64, mips32r6
...
For now, use generic C code instead of assembler.
Change-Id: I604ecdcde2d5373f1f68ab97a63a80667b630846
2015-01-12 22:18:13 -08:00
Riley Andrews
50bcb00a91
Fix signed/unsigned comparison warnings in driver interface test.
2015-01-12 18:20:49 -08:00
Jesse Hall
9c22ac77e4
am 5b730570: Merge "surfaceflinger: use Mutex timedLock instead of tryLock loop"
...
* commit '5b730570be2bd1f90346a5921d0b70dc11351396':
surfaceflinger: use Mutex timedLock instead of tryLock loop
2015-01-12 23:41:46 +00:00
Jesse Hall
5b730570be
Merge "surfaceflinger: use Mutex timedLock instead of tryLock loop"
2015-01-12 23:33:07 +00:00
Jeff Davidson
eb329c07c1
am 83f14309: Merge "Revert "Update protobuf library from 2.3 to 2.6.""
...
* commit '83f14309f17af398ec8ff7f82d9b2f010ea7cd5f':
Revert "Update protobuf library from 2.3 to 2.6."
2015-01-12 20:10:05 +00:00
Jeff Davidson
a9650f0ccc
Revert "Revert "Update protobuf library from 2.3 to 2.6.""
...
This reverts commit bca4262dac
2015-01-12 20:07:43 +00:00
Jeff Davidson
83f14309f1
Merge "Revert "Update protobuf library from 2.3 to 2.6.""
2015-01-12 20:00:51 +00:00
Jeff Davidson
bca4262dac
Revert "Update protobuf library from 2.3 to 2.6."
...
This reverts commit a42cdf1690
2015-01-12 20:00:33 +00:00
Jeff Davidson
7581a96bfd
am 9200d4e3: Merge "Update protobuf library from 2.3 to 2.6."
...
* commit '9200d4e3bf0bf9bf21d9bb335e04818364bf12a8':
Update protobuf library from 2.3 to 2.6.
2015-01-12 19:46:11 +00:00
Jeff Davidson
9200d4e3bf
Merge "Update protobuf library from 2.3 to 2.6."
2015-01-12 19:37:20 +00:00
Christopher Ferris
d8dc9405c3
am 4f9bfffe: Merge "Fix message when a command times out."
...
* commit '4f9bfffe23d40fdaabe91ea7c7691e52800edb79':
Fix message when a command times out.
2015-01-12 18:48:23 +00:00
Christopher Ferris
4f9bfffe23
Merge "Fix message when a command times out."
2015-01-12 18:41:07 +00:00
Jesse Hall
fcd15b478c
surfaceflinger: use Mutex timedLock instead of tryLock loop
...
Rather than trying to acquire the state lock without waiting three
times at 1 second intervals in SurfaceFlinger::dump(), just try to
acquire the lock once with a 1 second timeout. Avoids spurious mutex
acquire failures that lead to flaky
com.android.cts.jank.opengl.CtsHostJankOpenGl results.
Bug: 18842510
Change-Id: I00ce6109647de2aef8831dd2f8fa98652ba7f4e0
2015-01-10 15:41:01 -08:00
Rachad
2f70741547
am 806f23de: OpenMax IL: Added support for E-AC3 codec configuration params
...
* commit '806f23de71be2494cfabbe08d11c09606966a5d5':
OpenMax IL: Added support for E-AC3 codec configuration params
2015-01-10 02:00:07 +00:00
Christopher Ferris
67c5a8af9e
Fix message when a command times out.
...
The previous version printed out the nanoseconds elapsed, not seconds.
Change-Id: I10f6d7bf7b7a4647658313ed83781fda6fd744a5
2015-01-09 16:42:56 -08:00
Elliott Hughes
23958e1436
am a7dcab69: Merge "We have POSIX clocks, and we don\'t need to ask for the openssl headers."
...
* commit 'a7dcab6954467fa3726824a099b83d0e7490d6d5':
We have POSIX clocks, and we don't need to ask for the openssl headers.
2015-01-10 00:14:12 +00:00
Elliott Hughes
a7dcab6954
Merge "We have POSIX clocks, and we don't need to ask for the openssl headers."
2015-01-10 00:03:46 +00:00
Elliott Hughes
5ea47f7a32
We have POSIX clocks, and we don't need to ask for the openssl headers.
...
This code doesn't need to run on the Mac, and the BoringSSL transition
will be easier without references to external/openssl.
Change-Id: I14ea11fa2911af0f4e95e69636e6a2c26126cbe0
2015-01-09 15:56:15 -08:00
