Commit Graph

48548 Commits

Author SHA1 Message Date
Jeff Sharkey
7560443061 Increase screenshot timeout.
Devices with large displays take longer than 5 seconds to write.

Change-Id: If74bc4a3cec366ae28eca549bce28ef212e47d8f
2013-03-14 10:20:31 -07:00
Elliott Hughes
9943b7b9a5 am 801e632a: am 6250f6cb: am d8151306: Merge "Revert "Add a compatibility symbol for the MemoryBase constructor.""
* commit '801e632a1913819a7bf8542615caa80018c0f266':
  Revert "Add a compatibility symbol for the MemoryBase constructor."
2013-03-14 15:56:50 +00:00
Elliott Hughes
801e632a19 am 6250f6cb: am d8151306: Merge "Revert "Add a compatibility symbol for the MemoryBase constructor.""
* commit '6250f6cb2be039be150de6c836f8595384838342':
  Revert "Add a compatibility symbol for the MemoryBase constructor."
2013-03-14 08:55:49 -07:00
Jeff Sharkey
3fa3e38527 am d77d4e0e: Merge "Support broadcast when dumpstate finishes." into jb-mr2-dev
* commit 'd77d4e0edcb0d0f99dce2acea5278875be0b02a0':
  Support broadcast when dumpstate finishes.
2013-03-14 15:46:26 +00:00
Jeff Sharkey
d77d4e0edc Merge "Support broadcast when dumpstate finishes." into jb-mr2-dev 2013-03-14 15:44:15 +00:00
The Android Automerger
484229c742 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-03-14 05:55:37 -07:00
Elliott Hughes
f1d38fb2ff am c47f0988: Revert "Add a compatibility symbol for the MemoryBase constructor."
* commit 'c47f0988a36c3032a3c8850c4df3a704dd59e468':
  Revert "Add a compatibility symbol for the MemoryBase constructor."
2013-03-14 11:09:19 +00:00
Elliott Hughes
c47f0988a3 Revert "Add a compatibility symbol for the MemoryBase constructor."
Cherry pick from AOSP to fix the build.
See https://android-review.googlesource.com/#/c/53690/

This reverts commit 7f974ff2f3

Change-Id: I1b123f446d0ff41e11ff81d4ef5f1472b59cac93
2013-03-14 10:51:17 +00:00
Elliott Hughes
830f71c30e am 5ca39ea5: am 9b57ad73: am 8facd1b2: Merge "Add a compatibility symbol for the MemoryBase constructor."
* commit '5ca39ea57a4bfa04e90dd2aafc31c8f20bd8bf1c':
  Add a compatibility symbol for the MemoryBase constructor.
2013-03-14 06:13:16 +00:00
Elliott Hughes
5ca39ea57a am 9b57ad73: am 8facd1b2: Merge "Add a compatibility symbol for the MemoryBase constructor."
* commit '9b57ad737bceba9f8d4f5be303c70fa72be00eaf':
  Add a compatibility symbol for the MemoryBase constructor.
2013-03-13 23:11:00 -07:00
Elliott Hughes
7212ff29c6 am 20e154f1: Merge "Second try at adding a compatibility symbol for the MemoryBase constructor."
* commit '20e154f16f315d7ae0b3204db0004d19a8b0bc48':
  Second try at adding a compatibility symbol for the MemoryBase constructor.
2013-03-13 22:40:26 -07:00
Elliott Hughes
20e154f16f Merge "Second try at adding a compatibility symbol for the MemoryBase constructor." 2013-03-14 04:35:13 +00:00
Elliott Hughes
ddd286301b Second try at adding a compatibility symbol for the MemoryBase constructor.
Third-party libraries are currently trying to use the
MemoryBase constructor but failing because we fixed the
definition of ssize_t. This is a stop-gap for users of
this private API until we can get them fixed.

Bug: 8253769
Change-Id: Ie7c86f45fa39cb53539cab0ffe8585a585656714
2013-03-13 20:54:01 -07:00
Elliott Hughes
6250f6cb2b am d8151306: Merge "Revert "Add a compatibility symbol for the MemoryBase constructor.""
* commit 'd8151306f539f8c2f3b66c1fe06be9566ba8aca3':
  Revert "Add a compatibility symbol for the MemoryBase constructor."
2013-03-13 20:32:33 -07:00
Elliott Hughes
d8151306f5 Merge "Revert "Add a compatibility symbol for the MemoryBase constructor."" 2013-03-14 02:56:48 +00:00
Elliott Hughes
6dbf07d7d5 Revert "Add a compatibility symbol for the MemoryBase constructor."
This reverts commit 7f974ff2f3

Change-Id: I28ebfc5ac88bd025471b613aa7958d23749e6991
2013-03-14 02:56:34 +00:00
Elliott Hughes
9b57ad737b am 8facd1b2: Merge "Add a compatibility symbol for the MemoryBase constructor."
* commit '8facd1b2ea02796b575f123b420590d2b8354910':
  Add a compatibility symbol for the MemoryBase constructor.
2013-03-13 19:28:17 -07:00
Elliott Hughes
8facd1b2ea Merge "Add a compatibility symbol for the MemoryBase constructor." 2013-03-14 01:19:44 +00:00
Elliott Hughes
7f974ff2f3 Add a compatibility symbol for the MemoryBase constructor.
Third-party libraries are currently trying to use the
MemoryBase constructor but failing because we fixed the
definition of ssize_t. This is a stop-gap for users of
this private API until we can get them fixed.

Bug: 8253769
Change-Id: I8a19770f3252d88ee87023fde625cc6289924b0d
2013-03-13 18:19:20 -07:00
Jeff Sharkey
27f9e6d849 Support broadcast when dumpstate finishes.
Add flag that sends BUGREPORT_FINISHED broadcast when dumpstate
is finished, including the resulting filesystem paths.  Also reduces
directory creation to 0770.

Bug: 7005318
Change-Id: Id4c6b699a56f8acd859b7ab73368500e1a8f3c67
2013-03-13 16:59:27 -07:00
Mathias Agopian
397ff875b2 size IMemoryHeap properly for screenshots
since we're using glReadPixels(), we only need to use
the width (as opposed to the stride) of the source
screenshot.

Bug: 8374664
Change-Id: I145c80f4fff5444df7c77c4f52e70a7203caddbd
2013-03-13 15:48:20 -07:00
Mathias Agopian
a161d37a81 am 6a531717: size IMemoryHeap properly for screenshots
* commit '6a531717cddf1d30be0946884d21c27e5b6b390c':
  size IMemoryHeap properly for screenshots
2013-03-13 22:26:46 +00:00
Mathias Agopian
6a531717cd size IMemoryHeap properly for screenshots
since we're using glReadPixels(), we only need to use
the width (as opposed to the stride) of the source
screenshot.

Bug: 8374664
Change-Id: I145c80f4fff5444df7c77c4f52e70a7203caddbd
2013-03-13 15:22:11 -07:00
Mathias Agopian
1ffc0e7a3b am 35ffa6a8: Surface can now be created only from an IGraphicBufferProducer
* commit '35ffa6a868f1aa650c90956a4129bb70f780fc99':
  Surface can now be created only from an IGraphicBufferProducer
2013-03-13 21:48:15 +00:00
Mathias Agopian
ad84fa334c am 4d9b822e: get rid of ISurface
* commit '4d9b822e2c18142e55fe2611aa6cd7dc7d4a62c6':
  get rid of ISurface
2013-03-13 21:44:30 +00:00
Jeff Tinker
56c78c47d8 Updated MediaDrm API based on review input.
Change-Id: I06716d2616bbe7efaea6cbf9ba7bf303dfae1650
2013-03-13 13:35:36 -07:00
The Android Automerger
b4477d5638 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-03-13 05:55:39 -07:00
Mathias Agopian
35ffa6a868 Surface can now be created only from an IGraphicBufferProducer
it can't write itself to a parcel, nor can it be created from a
parcel.

Change-Id: I69165d5c54d6024b3e546e80d8b57e3dedda7893
2013-03-12 18:45:09 -07:00
Mathias Agopian
4d9b822e2c get rid of ISurface
ISurface was only used to get the IGraphicBufferProducer from
a Layer. It's now replaced by a BBinder subclass / IBinder and
is only used as a handle to the surface, to both refer to it
and manage its life-time.

Also cleaned-up a bit the ISurfaceComposer interface and
"create layer" code path.

Change-Id: I68d0e02d57b862cffb31d5168c3bc10cea0906eb
2013-03-12 17:11:48 -07:00
Jamie Gennis
3b039784c0 am f44e9f91: Merge "atrace: add the webview category" into jb-mr2-dev
* commit 'f44e9f91f37d3fbed64bc952f241d5dc3c385b6a':
  atrace: add the webview category
2013-03-12 19:22:52 +00:00
Jamie Gennis
f44e9f91f3 Merge "atrace: add the webview category" into jb-mr2-dev 2013-03-12 19:21:30 +00:00
The Android Open Source Project
d472db6d8e Reconcile with jb-mr2-release - do not merge
Change-Id: I31a3e1b1185ded041c4b1dea06da4f2cd87fe21d
2013-03-12 07:14:48 -07:00
The Android Automerger
101670cfa2 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-03-12 05:55:47 -07:00
Mathias Agopian
9ac559b58c am f795852b: temporary: enable ASSERTs in RefBase
* commit 'f795852b54b39eb373e0c421b63dc9a98822ac2c':
  temporary: enable ASSERTs in RefBase
2013-03-12 04:35:24 +00:00
Mathias Agopian
f795852b54 temporary: enable ASSERTs in RefBase
this is in an attempt to get more data on
bug 8328715.

Change-Id: I9333a67c2d7f67f4d9b2fc5eb1ad8a7b2d1c6dcb
2013-03-11 21:27:16 -07:00
Mathias Agopian
815721f6ab am b7a5b05b: Fix missing recents screenshots
* commit 'b7a5b05b53b81cb24849c7e9934c941f64e05a42':
  Fix missing recents screenshots
2013-03-12 03:52:42 +00:00
Mathias Agopian
b7a5b05b53 Fix missing recents screenshots
We were using the "visible layer list" when taking screenshots,
which doesn't work when a layer is behind other opaque layers
and therefore hidden.

We fix this by using the full layer list, filtered by the
layerstack of the display we're looking at.

Bug: 7552304
Change-Id: I4b6f77e5511aea94f8d218975b6e22738e7e5d5b
2013-03-11 20:47:24 -07:00
Jamie Gennis
b2a89e3155 atrace: add the webview category
Change-Id: Iefb552cd275bb5784903e8bf328890ecd233e45b
2013-03-11 19:41:28 -07:00
Michael Wright
ff164b69de am 2aee1b01: Merge "Add TOUCH_NAVIGATION input source" into jb-mr2-dev
* commit '2aee1b01b7f4e1e0849f5653139a995ad6ba877e':
  Add TOUCH_NAVIGATION input source
2013-03-12 01:16:53 +00:00
Michael Wright
2aee1b01b7 Merge "Add TOUCH_NAVIGATION input source" into jb-mr2-dev 2013-03-12 01:15:48 +00:00
Mathias Agopian
5e80aa10d3 am d2d5a64a: workaround a deadlock when taking screenshots into a surface
* commit 'd2d5a64aa21cfc548c8c8333d1b36979e5e5a640':
  workaround a deadlock when taking screenshots into a surface
2013-03-12 01:13:28 +00:00
Mathias Agopian
d2d5a64aa2 workaround a deadlock when taking screenshots into a surface
When disconnecting from BufferQueue, we now drain the queue
except the head (which means in the screenshot case we won't
have to block, but we might not have a buffer to show, this
will appear as an error in the log).

Bug: 8362363
Change-Id: If80989aac3c917beea2ebddf3cbb502849d394da
2013-03-11 17:59:59 -07:00
Romain Guy
c75412dcdd am dbca4a0e: Merge "Add Thread::isRunning and Condition::signal(WakeUpType)" into jb-mr2-dev
* commit 'dbca4a0ee5dac0b2f8d0ed4b1667adbf11363e35':
  Add Thread::isRunning and Condition::signal(WakeUpType)
2013-03-11 21:39:27 +00:00
Romain Guy
dbca4a0ee5 Merge "Add Thread::isRunning and Condition::signal(WakeUpType)" into jb-mr2-dev 2013-03-11 21:38:26 +00:00
Romain Guy
9447be65c3 Add Thread::isRunning and Condition::signal(WakeUpType)
The signal() method is useful to choose whether to wake up one or
all threads.

Change-Id: I062ab6d3ddd306a9fb735549ea140e2a76eed75a
2013-03-11 14:34:56 -07:00
Michael Wright
aadaca7169 Add TOUCH_NAVIGATION input source
Change-Id: Id76e2e85246269ba7b16bb9635e41593b45cac1c
2013-03-11 14:20:14 -07:00
Jean-Baptiste Queru
c1509400dc am 5c19de4d: am 1d6e52d1: am 50d36d58: am 75bcd737: am 4ddcb758: (-s ours) am 9ef024ec: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '5c19de4d070dfaebde92a5df4e54c959eef95cba':
2013-03-11 20:49:20 +00:00
Jean-Baptiste Queru
5c19de4d07 am 1d6e52d1: am 50d36d58: am 75bcd737: am 4ddcb758: (-s ours) am 9ef024ec: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '1d6e52d17e2df913e10925c5e3e652d3421ff320':
2013-03-11 13:44:33 -07:00
Jean-Baptiste Queru
1d6e52d17e am 50d36d58: am 75bcd737: am 4ddcb758: (-s ours) am 9ef024ec: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '50d36d58369cdf48bc6fcdba96b36c846be8587a':
2013-03-11 13:13:37 -07:00
Jean-Baptiste Queru
50d36d5836 am 75bcd737: am 4ddcb758: (-s ours) am 9ef024ec: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '75bcd737770f85114673c4411b8e2ecc0dd32bdf':
2013-03-11 13:00:44 -07:00