Commit Graph

48368 Commits

Author SHA1 Message Date
Jesse Hall
7adb0f8a9f Minor cleanups/fixes before virtual display refactoring
None of these should change behavior, except for removing some
incorrect log messages when using a virtual display.

- HWComposer::getAndResetReleaseFenceFd() checks the HWC version, so
  no need to do that in the DisplayDevice::onSwapBuffersCompleted().
  However, it should check that mFramebufferSurface is not NULL like
  it is for virtual displays.
- Comment that FramebufferSurface::dump() overrides the non-virtual
  ConsumerBase::dump(), and fix it so the right thing happens
  regardless of the static type of the pointer/reference the callee
  has. FramebufferSurface::dump() could be removed right now, but I'd
  need to bring it back in a later change.
- Use the right enum for validating display type ids.
- Don't try to send hotplug events for virtual displays.
- Mark virtual displays as connected so HWComposer::prepare() doesn't
  think something is wrong when it gets a non-NULL layer list.
- Remove unused FramebufferSurface methods.

Bug: 8384764
Change-Id: Id28a2f9be86b45f4bb7915fdf7752157035f4294
2013-03-18 14:16:02 -07:00
Jamie Gennis
e9b8cfb632 atrace: add support for tracing kernel functions
This change adds support for tracing specific kernel function calls using the
function_graph tracer.  It adds a '-k' option to atrace that accepts a comma
separated list of kernel function names for which tracing will be enabled.

Change-Id: I872b2f1d474b8ebb904053853fc8cf8c0a98089c
2013-03-18 13:56:18 -07:00
The Android Automerger
152eb67787 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-03-18 05:55:58 -07:00
Jesse Hall
df608eb15d am ce7e2781: Merge "Add Vector::resize()" into jb-mr2-dev
* commit 'ce7e278151d268f3cf55bcecd05f6be8c7e82e0f':
  Add Vector::resize()
2013-03-17 16:18:34 +00:00
Mathias Agopian
df6c6e97b5 am 041a0752: don\'t allow screenshots without the READ_FRAMEBUFFER permission
* commit '041a075262ef5fc886e46fd4eec3dd79ee2e60c0':
  don't allow screenshots without the READ_FRAMEBUFFER permission
2013-03-17 16:18:34 +00:00
Jesse Hall
ce7e278151 Merge "Add Vector::resize()" into jb-mr2-dev 2013-03-16 03:23:13 +00:00
Mathias Agopian
041a075262 don't allow screenshots without the READ_FRAMEBUFFER permission
the recent screenshot rework allowed the older screenshot
interface to work without that permission

Change-Id: I6c4743f4591c81106e3b823d55a055f7b4907de1
2013-03-15 18:39:16 -07:00
Mathias Agopian
0714d09e47 am 7670d3cb: Merge "get rid of purgatory and fix QueuesToWindowComposer query" into jb-mr2-dev
* commit '7670d3cb2b5d38c60135f34a2446e1ae809d1b32':
  get rid of purgatory and fix QueuesToWindowComposer query
2013-03-16 01:16:22 +00:00
Mathias Agopian
7670d3cb2b Merge "get rid of purgatory and fix QueuesToWindowComposer query" into jb-mr2-dev 2013-03-16 01:14:35 +00:00
Mathias Agopian
28e89fed09 am a493be58: don\'t capture hidden layers in screenshots
* commit 'a493be5825d15f6a94d1afb5910db075a2a7abc1':
  don't capture hidden layers in screenshots
2013-03-15 23:16:30 +00:00
Mathias Agopian
a493be5825 don't capture hidden layers in screenshots
Bug: 8389956
Change-Id: I9ed836395258732c743c6fd44092bd01020dde13
2013-03-15 16:08:10 -07:00
Jesse Hall
e81421e1cb Add Vector::resize()
Bug: 8384764
Change-Id: Icee83d389f3e555eba7d419b64c8d52a9aa21b8b
2013-03-15 12:40:39 -07:00
Dianne Hackborn
5f72d05a01 am 1791eefd: fix a couple race-conditions in RefBase::promote()
* commit '1791eefd69e07a7d8a311ee8a298bbd2de77f046':
  fix a couple race-conditions in RefBase::promote()
2013-03-15 04:33:06 +00:00
Mathias Agopian
6710604286 get rid of purgatory and fix QueuesToWindowComposer query
the purgatory list wasn't needed anymore; in fact it had no effect as
buffer life-time management is now handled by the BufferQueue.

For QueuesToWindowComposer we keep a list of wp<> on the IBinder
for IGraphicBufferProducers we hand over to clients so we can
easily check if an IGraphicBufferProducer is ours. We clean-up the
list when our IGraphicBufferProducer are destroyed.

Bug: 8349142
Change-Id: I1aa06652ade8c72d0004a3f5e6c3d6e8a82fc2ae
2013-03-14 19:18:13 -07:00
Dianne Hackborn
1791eefd69 fix a couple race-conditions in RefBase::promote()
Bug: 8390295
Change-Id: I7a48e3bf5b213cc1da2b8e844c6bb37ee24cb047
2013-03-14 16:47:41 -07:00
Elliott Hughes
284414bf4f am 7212ff29: am 20e154f1: Merge "Second try at adding a compatibility symbol for the MemoryBase constructor."
* commit '7212ff29c6f4e4cd192fee6f072e80b36d8a728b':
  Second try at adding a compatibility symbol for the MemoryBase constructor.
2013-03-14 15:12:53 -07:00
Elliott Hughes
9bd5c8274c am 5b00af24: am 7212ff29: am 20e154f1: Merge "Second try at adding a compatibility symbol for the MemoryBase constructor."
* commit '5b00af2435d67ccf806c918f6482949870fd993b':
  Second try at adding a compatibility symbol for the MemoryBase constructor.
2013-03-14 17:33:59 +00:00
Elliott Hughes
5b00af2435 am 7212ff29: am 20e154f1: Merge "Second try at adding a compatibility symbol for the MemoryBase constructor."
* commit '7212ff29c6f4e4cd192fee6f072e80b36d8a728b':
  Second try at adding a compatibility symbol for the MemoryBase constructor.
2013-03-14 10:31:38 -07:00
Jeff Sharkey
a6d94e8dfe am a11713ce: Merge "Increase screenshot timeout." into jb-mr2-dev
* commit 'a11713ce3e81d7838092168fad110bea3212a9f3':
  Increase screenshot timeout.
2013-03-14 17:22:50 +00:00
Jeff Sharkey
a11713ce3e Merge "Increase screenshot timeout." into jb-mr2-dev 2013-03-14 17:21:08 +00:00
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