OSDN Git Service
The Android Automerger [Mon, 18 Mar 2013 14:49:43 +0000 (07:49 -0700)]
merge in master-release history after reset to master
Jesse Hall [Sun, 17 Mar 2013 16:27:56 +0000 (16:27 +0000)]
am
df608eb1: am
ce7e2781: Merge "Add Vector::resize()" into jb-mr2-dev
* commit '
df608eb15d3b90d2e71e07baaa6de423c29769c8':
Add Vector::resize()
Mathias Agopian [Sun, 17 Mar 2013 16:27:56 +0000 (16:27 +0000)]
am
df6c6e97: am
041a0752: don\'t allow screenshots without the READ_FRAMEBUFFER permission
* commit '
df6c6e97b52cbd84f04d1be9a03f44816919dc37':
don't allow screenshots without the READ_FRAMEBUFFER permission
Mathias Agopian [Sun, 17 Mar 2013 16:18:35 +0000 (16:18 +0000)]
am
0714d09e: am
7670d3cb: Merge "get rid of purgatory and fix QueuesToWindowComposer query" into jb-mr2-dev
* commit '
0714d09e47d86cf9c437f670b0cb043b1fe28631':
get rid of purgatory and fix QueuesToWindowComposer query
Jesse Hall [Sun, 17 Mar 2013 16:18:34 +0000 (16:18 +0000)]
am
ce7e2781: Merge "Add Vector::resize()" into jb-mr2-dev
* commit '
ce7e278151d268f3cf55bcecd05f6be8c7e82e0f':
Add Vector::resize()
Mathias Agopian [Sun, 17 Mar 2013 16:18:34 +0000 (16:18 +0000)]
am
041a0752: don\'t allow screenshots without the READ_FRAMEBUFFER permission
* commit '
041a075262ef5fc886e46fd4eec3dd79ee2e60c0':
don't allow screenshots without the READ_FRAMEBUFFER permission
Jesse Hall [Sat, 16 Mar 2013 03:23:12 +0000 (03:23 +0000)]
Merge "Add Vector::resize()" into jb-mr2-dev
Mathias Agopian [Sat, 16 Mar 2013 01:31:56 +0000 (18:31 -0700)]
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
Mathias Agopian [Sat, 16 Mar 2013 01:16:22 +0000 (01:16 +0000)]
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
Mathias Agopian [Sat, 16 Mar 2013 01:14:34 +0000 (01:14 +0000)]
Merge "get rid of purgatory and fix QueuesToWindowComposer query" into jb-mr2-dev
Mathias Agopian [Fri, 15 Mar 2013 23:17:45 +0000 (23:17 +0000)]
am
28e89fed: am
a493be58: don\'t capture hidden layers in screenshots
* commit '
28e89fed092dfc1d4a182e98a59f4ec5c3148625':
don't capture hidden layers in screenshots
Mathias Agopian [Fri, 15 Mar 2013 23:16:30 +0000 (23:16 +0000)]
am
a493be58: don\'t capture hidden layers in screenshots
* commit '
a493be5825d15f6a94d1afb5910db075a2a7abc1':
don't capture hidden layers in screenshots
Mathias Agopian [Fri, 15 Mar 2013 23:08:10 +0000 (16:08 -0700)]
don't capture hidden layers in screenshots
Bug:
8389956
Change-Id: I9ed836395258732c743c6fd44092bd01020dde13
Jesse Hall [Mon, 11 Mar 2013 17:16:48 +0000 (10:16 -0700)]
Add Vector::resize()
Bug:
8384764
Change-Id: Icee83d389f3e555eba7d419b64c8d52a9aa21b8b
The Android Automerger [Fri, 15 Mar 2013 14:50:08 +0000 (07:50 -0700)]
merge in master-release history after reset to master
Dianne Hackborn [Fri, 15 Mar 2013 04:35:16 +0000 (04:35 +0000)]
am
5f72d05a: am
1791eefd: fix a couple race-conditions in RefBase::promote()
* commit '
5f72d05a01d9b7a1bd6d2a2a269b80facd206066':
fix a couple race-conditions in RefBase::promote()
Dianne Hackborn [Fri, 15 Mar 2013 04:33:06 +0000 (04:33 +0000)]
am
1791eefd: fix a couple race-conditions in RefBase::promote()
* commit '
1791eefd69e07a7d8a311ee8a298bbd2de77f046':
fix a couple race-conditions in RefBase::promote()
Mathias Agopian [Fri, 15 Mar 2013 02:18:13 +0000 (19:18 -0700)]
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
Dianne Hackborn [Thu, 14 Mar 2013 22:26:30 +0000 (15:26 -0700)]
fix a couple race-conditions in RefBase::promote()
Bug:
8390295
Change-Id: I7a48e3bf5b213cc1da2b8e844c6bb37ee24cb047
Elliott Hughes [Thu, 14 Mar 2013 17:36:01 +0000 (17:36 +0000)]
am
9bd5c827: am
5b00af24: am
7212ff29: am
20e154f1: Merge "Second try at adding a compatibility symbol for the MemoryBase constructor."
* commit '
9bd5c8274c822540473dfc646b47b4121785c727':
Second try at adding a compatibility symbol for the MemoryBase constructor.
Elliott Hughes [Thu, 14 Mar 2013 17:33:59 +0000 (17:33 +0000)]
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.
Elliott Hughes [Thu, 14 Mar 2013 17:31:38 +0000 (10:31 -0700)]
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.
Jeff Sharkey [Thu, 14 Mar 2013 17:26:10 +0000 (17:26 +0000)]
am
a6d94e8d: am
a11713ce: Merge "Increase screenshot timeout." into jb-mr2-dev
* commit '
a6d94e8dfe7a251066b74bb3f3a6722e0c2713b5':
Increase screenshot timeout.
Jeff Sharkey [Thu, 14 Mar 2013 17:22:50 +0000 (17:22 +0000)]
am
a11713ce: Merge "Increase screenshot timeout." into jb-mr2-dev
* commit '
a11713ce3e81d7838092168fad110bea3212a9f3':
Increase screenshot timeout.
Jeff Sharkey [Thu, 14 Mar 2013 17:21:08 +0000 (17:21 +0000)]
Merge "Increase screenshot timeout." into jb-mr2-dev
Jeff Sharkey [Thu, 14 Mar 2013 17:20:31 +0000 (10:20 -0700)]
Increase screenshot timeout.
Devices with large displays take longer than 5 seconds to write.
Change-Id: If74bc4a3cec366ae28eca549bce28ef212e47d8f
Elliott Hughes [Thu, 14 Mar 2013 15:57:59 +0000 (15:57 +0000)]
am
9943b7b9: am
801e632a: am
6250f6cb: am
d8151306: Merge "Revert "Add a compatibility symbol for the MemoryBase constructor.""
* commit '
9943b7b9a5bfabe5f306f780fc9ab8ba9938a652':
Revert "Add a compatibility symbol for the MemoryBase constructor."
Elliott Hughes [Thu, 14 Mar 2013 15:56:50 +0000 (15:56 +0000)]
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."
Elliott Hughes [Thu, 14 Mar 2013 15:55:49 +0000 (08:55 -0700)]
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."
Jeff Sharkey [Thu, 14 Mar 2013 15:48:26 +0000 (15:48 +0000)]
am
3fa3e385: am
d77d4e0e: Merge "Support broadcast when dumpstate finishes." into jb-mr2-dev
* commit '
3fa3e38527320e27c40fbcbc3d53ed68b1442e86':
Support broadcast when dumpstate finishes.
Jeff Sharkey [Thu, 14 Mar 2013 15:46:26 +0000 (15:46 +0000)]
am
d77d4e0e: Merge "Support broadcast when dumpstate finishes." into jb-mr2-dev
* commit '
d77d4e0edcb0d0f99dce2acea5278875be0b02a0':
Support broadcast when dumpstate finishes.
Jeff Sharkey [Thu, 14 Mar 2013 15:44:15 +0000 (15:44 +0000)]
Merge "Support broadcast when dumpstate finishes." into jb-mr2-dev
The Android Automerger [Thu, 14 Mar 2013 14:49:49 +0000 (07:49 -0700)]
merge in master-release history after reset to master
Elliott Hughes [Thu, 14 Mar 2013 11:11:37 +0000 (11:11 +0000)]
am
f1d38fb2: am
c47f0988: Revert "Add a compatibility symbol for the MemoryBase constructor."
* commit '
f1d38fb2ff9c11ddc1b0618c90e10abbe43b0939':
Revert "Add a compatibility symbol for the MemoryBase constructor."
Elliott Hughes [Thu, 14 Mar 2013 11:09:19 +0000 (11:09 +0000)]
am
c47f0988: Revert "Add a compatibility symbol for the MemoryBase constructor."
* commit '
c47f0988a36c3032a3c8850c4df3a704dd59e468':
Revert "Add a compatibility symbol for the MemoryBase constructor."
Elliott Hughes [Thu, 14 Mar 2013 02:56:34 +0000 (02:56 +0000)]
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
7f974ff2f317ffbf9256579109f000ec876c3037
Change-Id: I1b123f446d0ff41e11ff81d4ef5f1472b59cac93
Elliott Hughes [Thu, 14 Mar 2013 06:15:23 +0000 (06:15 +0000)]
am
830f71c3: am
5ca39ea5: am
9b57ad73: am
8facd1b2: Merge "Add a compatibility symbol for the MemoryBase constructor."
* commit '
830f71c30ed8d72ef0682c01e9deb6a5284eca9b':
Add a compatibility symbol for the MemoryBase constructor.
Elliott Hughes [Thu, 14 Mar 2013 06:13:16 +0000 (06:13 +0000)]
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.
Elliott Hughes [Thu, 14 Mar 2013 06:11:00 +0000 (23:11 -0700)]
am
9b57ad73: am
8facd1b2: Merge "Add a compatibility symbol for the MemoryBase constructor."
* commit '
9b57ad737bceba9f8d4f5be303c70fa72be00eaf':
Add a compatibility symbol for the MemoryBase constructor.
Elliott Hughes [Thu, 14 Mar 2013 05:40:26 +0000 (22:40 -0700)]
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.
Elliott Hughes [Thu, 14 Mar 2013 04:35:13 +0000 (04:35 +0000)]
Merge "Second try at adding a compatibility symbol for the MemoryBase constructor."
Elliott Hughes [Thu, 14 Mar 2013 03:54:01 +0000 (20:54 -0700)]
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
Elliott Hughes [Thu, 14 Mar 2013 03:32:33 +0000 (20:32 -0700)]
am
d8151306: Merge "Revert "Add a compatibility symbol for the MemoryBase constructor.""
* commit '
d8151306f539f8c2f3b66c1fe06be9566ba8aca3':
Revert "Add a compatibility symbol for the MemoryBase constructor."
Elliott Hughes [Thu, 14 Mar 2013 02:56:48 +0000 (02:56 +0000)]
Merge "Revert "Add a compatibility symbol for the MemoryBase constructor.""
Elliott Hughes [Thu, 14 Mar 2013 02:56:34 +0000 (02:56 +0000)]
Revert "Add a compatibility symbol for the MemoryBase constructor."
This reverts commit
7f974ff2f317ffbf9256579109f000ec876c3037
Change-Id: I28ebfc5ac88bd025471b613aa7958d23749e6991
Mathias Agopian [Thu, 14 Mar 2013 02:34:17 +0000 (02:34 +0000)]
am
a161d37a: am
6a531717: size IMemoryHeap properly for screenshots
* commit '
a161d37a8137c0058b42ca54026e16f3088d9a8d':
size IMemoryHeap properly for screenshots
Mathias Agopian [Thu, 14 Mar 2013 02:34:13 +0000 (02:34 +0000)]
am
1ffc0e7a: am
35ffa6a8: Surface can now be created only from an IGraphicBufferProducer
* commit '
1ffc0e7a3b2e9911e020ca5fce0bb088f33d85d9':
Surface can now be created only from an IGraphicBufferProducer
Mathias Agopian [Thu, 14 Mar 2013 02:34:12 +0000 (02:34 +0000)]
am
ad84fa33: am
4d9b822e: get rid of ISurface
* commit '
ad84fa334c5baec53b1607a23483f40907e964de':
get rid of ISurface
Elliott Hughes [Thu, 14 Mar 2013 02:28:17 +0000 (19:28 -0700)]
am
8facd1b2: Merge "Add a compatibility symbol for the MemoryBase constructor."
* commit '
8facd1b2ea02796b575f123b420590d2b8354910':
Add a compatibility symbol for the MemoryBase constructor.
Elliott Hughes [Thu, 14 Mar 2013 01:19:44 +0000 (01:19 +0000)]
Merge "Add a compatibility symbol for the MemoryBase constructor."
Elliott Hughes [Wed, 13 Mar 2013 21:35:55 +0000 (14:35 -0700)]
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
Jeff Sharkey [Wed, 13 Mar 2013 22:45:50 +0000 (15:45 -0700)]
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
Mathias Agopian [Wed, 13 Mar 2013 22:26:46 +0000 (22:26 +0000)]
am
6a531717: size IMemoryHeap properly for screenshots
* commit '
6a531717cddf1d30be0946884d21c27e5b6b390c':
size IMemoryHeap properly for screenshots
Mathias Agopian [Wed, 13 Mar 2013 22:22:11 +0000 (15:22 -0700)]
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
Mathias Agopian [Wed, 13 Mar 2013 21:48:15 +0000 (21:48 +0000)]
am
35ffa6a8: Surface can now be created only from an IGraphicBufferProducer
* commit '
35ffa6a868f1aa650c90956a4129bb70f780fc99':
Surface can now be created only from an IGraphicBufferProducer
Mathias Agopian [Wed, 13 Mar 2013 21:44:30 +0000 (21:44 +0000)]
am
4d9b822e: get rid of ISurface
* commit '
4d9b822e2c18142e55fe2611aa6cd7dc7d4a62c6':
get rid of ISurface
The Android Automerger [Wed, 13 Mar 2013 14:49:52 +0000 (07:49 -0700)]
merge in master-release history after reset to master
Mathias Agopian [Wed, 13 Mar 2013 01:45:09 +0000 (18:45 -0700)]
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
Mathias Agopian [Wed, 13 Mar 2013 00:11:48 +0000 (17:11 -0700)]
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
Jamie Gennis [Tue, 12 Mar 2013 19:27:48 +0000 (19:27 +0000)]
am
3b039784: am
f44e9f91: Merge "atrace: add the webview category" into jb-mr2-dev
* commit '
3b039784c0cf941d9a1ccb00e7dce1730e223173':
atrace: add the webview category
Jamie Gennis [Tue, 12 Mar 2013 19:22:52 +0000 (19:22 +0000)]
am
f44e9f91: Merge "atrace: add the webview category" into jb-mr2-dev
* commit '
f44e9f91f37d3fbed64bc952f241d5dc3c385b6a':
atrace: add the webview category
Jamie Gennis [Tue, 12 Mar 2013 19:21:29 +0000 (19:21 +0000)]
Merge "atrace: add the webview category" into jb-mr2-dev
The Android Automerger [Tue, 12 Mar 2013 14:50:07 +0000 (07:50 -0700)]
merge in master-release history after reset to master
The Android Open Source Project [Tue, 12 Mar 2013 14:16:40 +0000 (14:16 +0000)]
am
d472db6d: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
d472db6d8e5b2e7365e86fe78b7d1d2ac90d9e34':
When disconnecting a surface, cancel don't queue the buffer
Defer destroying surfaces until not current
The Android Open Source Project [Tue, 12 Mar 2013 14:14:48 +0000 (07:14 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I31a3e1b1185ded041c4b1dea06da4f2cd87fe21d
The Android Automerger [Tue, 12 Mar 2013 12:55:47 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Mathias Agopian [Tue, 12 Mar 2013 04:36:53 +0000 (04:36 +0000)]
am
9ac559b5: am
f795852b: temporary: enable ASSERTs in RefBase
* commit '
9ac559b58c49a43ed9468422feef0ae500340efe':
temporary: enable ASSERTs in RefBase
Mathias Agopian [Tue, 12 Mar 2013 04:35:24 +0000 (04:35 +0000)]
am
f795852b: temporary: enable ASSERTs in RefBase
* commit '
f795852b54b39eb373e0c421b63dc9a98822ac2c':
temporary: enable ASSERTs in RefBase
Mathias Agopian [Tue, 12 Mar 2013 04:27:16 +0000 (21:27 -0700)]
temporary: enable ASSERTs in RefBase
this is in an attempt to get more data on
bug
8328715.
Change-Id: I9333a67c2d7f67f4d9b2fc5eb1ad8a7b2d1c6dcb
Mathias Agopian [Tue, 12 Mar 2013 03:54:45 +0000 (03:54 +0000)]
am
815721f6: am
b7a5b05b: Fix missing recents screenshots
* commit '
815721f6ab5e9caea0e8ec9605fd0d0c4aacba18':
Fix missing recents screenshots
Mathias Agopian [Tue, 12 Mar 2013 03:52:42 +0000 (03:52 +0000)]
am
b7a5b05b: Fix missing recents screenshots
* commit '
b7a5b05b53b81cb24849c7e9934c941f64e05a42':
Fix missing recents screenshots
Mathias Agopian [Tue, 12 Mar 2013 03:47:24 +0000 (20:47 -0700)]
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
Jamie Gennis [Tue, 12 Mar 2013 02:37:53 +0000 (19:37 -0700)]
atrace: add the webview category
Change-Id: Iefb552cd275bb5784903e8bf328890ecd233e45b
Michael Wright [Tue, 12 Mar 2013 01:19:03 +0000 (01:19 +0000)]
am
ff164b69: am
2aee1b01: Merge "Add TOUCH_NAVIGATION input source" into jb-mr2-dev
* commit '
ff164b69de713ecabf2f3c6b4f718503591a7321':
Add TOUCH_NAVIGATION input source
Michael Wright [Tue, 12 Mar 2013 01:16:53 +0000 (01:16 +0000)]
am
2aee1b01: Merge "Add TOUCH_NAVIGATION input source" into jb-mr2-dev
* commit '
2aee1b01b7f4e1e0849f5653139a995ad6ba877e':
Add TOUCH_NAVIGATION input source
Michael Wright [Tue, 12 Mar 2013 01:15:48 +0000 (01:15 +0000)]
Merge "Add TOUCH_NAVIGATION input source" into jb-mr2-dev
Mathias Agopian [Tue, 12 Mar 2013 01:15:43 +0000 (01:15 +0000)]
am
5e80aa10: am
d2d5a64a: workaround a deadlock when taking screenshots into a surface
* commit '
5e80aa10d37dc066b2e079037a0564703be92ebb':
workaround a deadlock when taking screenshots into a surface
Mathias Agopian [Tue, 12 Mar 2013 01:13:28 +0000 (01:13 +0000)]
am
d2d5a64a: workaround a deadlock when taking screenshots into a surface
* commit '
d2d5a64aa21cfc548c8c8333d1b36979e5e5a640':
workaround a deadlock when taking screenshots into a surface
Mathias Agopian [Tue, 12 Mar 2013 00:59:59 +0000 (17:59 -0700)]
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
Romain Guy [Mon, 11 Mar 2013 21:41:18 +0000 (21:41 +0000)]
am
c75412dc: am
dbca4a0e: Merge "Add Thread::isRunning and Condition::signal(WakeUpType)" into jb-mr2-dev
* commit '
c75412dcdd617423a033e4a647f43b35af1fc0c4':
Add Thread::isRunning and Condition::signal(WakeUpType)
Romain Guy [Mon, 11 Mar 2013 21:39:27 +0000 (21:39 +0000)]
am
dbca4a0e: Merge "Add Thread::isRunning and Condition::signal(WakeUpType)" into jb-mr2-dev
* commit '
dbca4a0ee5dac0b2f8d0ed4b1667adbf11363e35':
Add Thread::isRunning and Condition::signal(WakeUpType)
Romain Guy [Mon, 11 Mar 2013 21:38:26 +0000 (21:38 +0000)]
Merge "Add Thread::isRunning and Condition::signal(WakeUpType)" into jb-mr2-dev
Romain Guy [Mon, 11 Mar 2013 21:34:56 +0000 (14:34 -0700)]
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
Michael Wright [Mon, 11 Mar 2013 21:20:14 +0000 (14:20 -0700)]
Add TOUCH_NAVIGATION input source
Change-Id: Id76e2e85246269ba7b16bb9635e41593b45cac1c
Jean-Baptiste Queru [Mon, 11 Mar 2013 20:56:13 +0000 (20:56 +0000)]
am
c1509400: (-s ours) 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 '
c1509400dcf79d65b2624e6fc6e7f667ff9edb29':
Jean-Baptiste Queru [Mon, 11 Mar 2013 20:49:20 +0000 (20:49 +0000)]
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':
Jean-Baptiste Queru [Mon, 11 Mar 2013 20:44:33 +0000 (13:44 -0700)]
am
1d6e52d1: am
50d36d58: am
75bcd737: am
4ddcb758: (-s ours) am
9ef024ec: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
1d6e52d17e2df913e10925c5e3e652d3421ff320':
Jean-Baptiste Queru [Mon, 11 Mar 2013 20:13:37 +0000 (13:13 -0700)]
am
50d36d58: am
75bcd737: am
4ddcb758: (-s ours) am
9ef024ec: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
50d36d58369cdf48bc6fcdba96b36c846be8587a':
Jean-Baptiste Queru [Mon, 11 Mar 2013 20:00:44 +0000 (13:00 -0700)]
am
75bcd737: am
4ddcb758: (-s ours) am
9ef024ec: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
75bcd737770f85114673c4411b8e2ecc0dd32bdf':
Jean-Baptiste Queru [Mon, 11 Mar 2013 19:41:50 +0000 (12:41 -0700)]
am
4ddcb758: (-s ours) am
9ef024ec: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
4ddcb75861cfb2835fcc20f2071222d2f55450ba':
jp abgrall [Mon, 11 Mar 2013 19:41:22 +0000 (19:41 +0000)]
am
1e928f40: am
574d6902: am
ba8abb51: Merge "Ensure dumpstate children die"
* commit '
1e928f404f83da6ed29dc3d0b28f0a376b12d327':
Ensure dumpstate children die
jp abgrall [Mon, 11 Mar 2013 19:34:13 +0000 (19:34 +0000)]
am
574d6902: am
ba8abb51: Merge "Ensure dumpstate children die"
* commit '
574d6902b7e30a1e9c2375481549c8e8a712d6e6':
Ensure dumpstate children die
jp abgrall [Mon, 11 Mar 2013 19:28:06 +0000 (12:28 -0700)]
am
ba8abb51: Merge "Ensure dumpstate children die"
* commit '
ba8abb517d1eddebeda62bf907fa446e3c3b81f6':
Ensure dumpstate children die
Jean-Baptiste Queru [Mon, 11 Mar 2013 19:23:09 +0000 (12:23 -0700)]
am
9ef024ec: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
9ef024ec8ae0318c89cc65dc0591aa40695393fc':
Jean-Baptiste Queru [Mon, 11 Mar 2013 19:19:30 +0000 (12:19 -0700)]
Reconcile with jb-mr1-release - do not merge
jp abgrall [Mon, 11 Mar 2013 18:09:35 +0000 (18:09 +0000)]
Merge "Ensure dumpstate children die"
John Michelau [Thu, 7 Mar 2013 21:35:35 +0000 (15:35 -0600)]
Ensure dumpstate children die
Use prctl(PR_SET_PDEATHSIG, SIGKILL) in each forked child to ensure
it dies when dumpstate dies.
This is important for two cases:
- dumpstate runs a timer for each child process. On expiration, it
sends SIGTERM to kill the process. Sometimes SIGTERM isn't enough
to kill a hung process, so the child lives on.
- When dumpstate is killed by the user before completing, outstanding
children continue to run and generate output.
Change-Id: I96e0dc918c26d56c9fee53611980ba2edd238712
The Android Automerger [Mon, 11 Mar 2013 14:50:06 +0000 (07:50 -0700)]
merge in master-release history after reset to master
The Android Automerger [Mon, 11 Mar 2013 12:56:07 +0000 (05:56 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Mathias Agopian [Fri, 8 Mar 2013 22:50:24 +0000 (22:50 +0000)]
am
b1beeb4a: am
d5776414: make sure to call compositionComplete after taking a screenshot
* commit '
b1beeb4ab90fa00c24ae853818e2b33f32da851b':
make sure to call compositionComplete after taking a screenshot