Commit Graph

51919 Commits

Author SHA1 Message Date
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
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
Dan Stoza
b62767e855 am a5cbb1f1: am ef1c17ae: SurfaceFlinger: Make log message 64-bit compatible
* commit 'a5cbb1f18b6eb4e0db27d98bea0731393b7438d1':
  SurfaceFlinger: Make log message 64-bit compatible
2015-01-17 00:53:36 +00:00
Dan Stoza
3c7eb4fe23 am 3372cc25: resolved conflicts for merge of 03eccb66 to lmp-mr1-dev-plus-aosp
* commit '3372cc25df255b94e4eb75920afaf43ee5edc39f':
  SurfaceFlinger: Attempt to attribute fds to layers
2015-01-17 00:53:35 +00: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
1011032570 am 499127ea: am 8f3ade0c: Merge "Follow StrictMode refactoring."
* commit '499127eab812088ca24421b59ebfac6f47ea850f':
  Follow StrictMode refactoring.
2015-01-16 06:14:41 +00: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
0ccfff35a0 am e52299e7: am 1d463883: Merge "Use the timeout stack dump functions."
* commit 'e52299e76e8515a387c216bda61af88a8bc31ed5':
  Use the timeout stack dump functions.
2015-01-16 00:06:39 +00:00
Jeff Davidson
f2503425b1 am b9b86f64: am 4df903db: Merge "Revert "Revert "Update protobuf library from 2.3 to 2.6."""
* commit 'b9b86f644f47e6e3bdedc5b2419e9d4af1c8b455':
  Revert "Revert "Update protobuf library from 2.3 to 2.6.""
2015-01-16 00:06:08 +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)

Change-Id: I39e8e9c60209e3ef9efac795fedb8e1edce2bd3e
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
dd13c34308 am 8d129cbf: am 457731f6: Use the timeout stack dump functions.
* commit '8d129cbf5a8affebaf0883450d637132e2f9f512':
  Use the timeout stack dump functions.
2015-01-15 04:57:48 +00:00
Christopher Ferris
aade31f077 am 40a206b8: am d195f87b: Fix message when a command times out.
* commit '40a206b867b87288f97681d7f6e34374492c6864':
  Fix message when a command times out.
2015-01-15 04:30:15 +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)

Change-Id: Icbaaee83a92767694fd98e3c790f36f4d24681b0
2015-01-14 16:10:11 -08:00
Riley Andrews
a377321c61 am 15411a00: am aec92242: Merge "Replace all instances of intptr_t with uintptr_t."
* commit '15411a00e15ecb169b3ee8251aac01cfa4b4fb84':
  Replace all instances of intptr_t with uintptr_t.
2015-01-14 21:13:49 +00:00
Riley Andrews
a7f0432a3b am d66ba520: am 41a160c4: Merge "Fix signed/unsigned comparison warnings in driver interface test."
* commit 'd66ba5209a8bb10abd7514544159a19fedd81e52':
  Fix signed/unsigned comparison warnings in driver interface test.
2015-01-14 21:13:48 +00: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
b2276e30e7 am a198e1c1: am 6f9c6541: Merge "[MIPS] Build libGLES for mips64, mips32r6"
* commit 'a198e1c14d23efd0d3acbe05fab31bf92748f329':
  [MIPS] Build libGLES for mips64, mips32r6
2015-01-13 20:33:10 +00:00
Jesse Hall
8eb8069a2d am 9c22ac77: am 5b730570: Merge "surfaceflinger: use Mutex timedLock instead of tryLock loop"
* commit '9c22ac77e41b8bbddbb64959acabce3f3a07345d':
  surfaceflinger: use Mutex timedLock instead of tryLock loop
2015-01-13 20:32:28 +00:00
Jeff Davidson
d7e8118bff am eb329c07: am 83f14309: Merge "Revert "Update protobuf library from 2.3 to 2.6.""
* commit 'eb329c07c150dfaf539d1d48bedf1572e963348f':
  Revert "Update protobuf library from 2.3 to 2.6."
2015-01-13 20:31:12 +00:00
Jeff Davidson
51ba400e1f am 7581a96b: am 9200d4e3: Merge "Update protobuf library from 2.3 to 2.6."
* commit '7581a96bfd9219030a8ae8a15f545da0d7eccdda':
  Update protobuf library from 2.3 to 2.6.
2015-01-13 20:31:03 +00:00
Christopher Ferris
978f0f2b83 am d8dc9405: am 4f9bfffe: Merge "Fix message when a command times out."
* commit 'd8dc9405c3d5bb2cc20950ed8d6fe25c1239e8e1':
  Fix message when a command times out.
2015-01-13 20:30:45 +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.

Change-Id: I8ecd859340779dfacffba4c6d1a44c5cdbdfceed
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.

Change-Id: I8f75e6fcc921041ebdfd35c4724134fcb2c739c6
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