OSDN Git Service
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
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.
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
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 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 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
Mathias Agopian [Fri, 8 Mar 2013 22:50:24 +0000 (22:50 +0000)]
am
e491ec7c: am
7589b2a7: add two libgui tests
* commit '
e491ec7c93adb9ec9cfab0f6c7604383aa58d08c':
add two libgui tests
Mathias Agopian [Fri, 8 Mar 2013 22:46:55 +0000 (22:46 +0000)]
am
d5776414: make sure to call compositionComplete after taking a screenshot
* commit '
d577641411f067c93aabcd2acf7ce06862fb26d3':
make sure to call compositionComplete after taking a screenshot
Mathias Agopian [Fri, 8 Mar 2013 22:46:54 +0000 (22:46 +0000)]
am
7589b2a7: add two libgui tests
* commit '
7589b2a7975cc3bc2a0659ab6503ceb3e4d94048':
add two libgui tests
Mathias Agopian [Fri, 8 Mar 2013 21:54:46 +0000 (13:54 -0800)]
make sure to call compositionComplete after taking a screenshot
older drivers which are doing implicit synchronization need this
or they could deadlock.
Bug:
8341885
Change-Id: Icd980a6be16071678d6151e34725b3c1c547d7ee
Mathias Agopian [Fri, 8 Mar 2013 21:18:52 +0000 (13:18 -0800)]
add two libgui tests
we check that the order in which we destroy GLConsumer wrt.
releasing the corresponding EGLSurface via eglMake(Un)Current
doesn't leak a buffer.
On at least 2 devices this test doesn't pass.
Change-Id: I63ab83951b4b0a977f38571158f948cbd9dc7cec
Mathias Agopian [Fri, 8 Mar 2013 20:31:57 +0000 (20:31 +0000)]
am
3f27f950: am
6b2b7009: Merge changes Ibb3b6ff0,I2341e20c into jb-mr2-dev
* commit '
3f27f9503356f8f60246dd188c4dd899e8999150':
rename binder services main thread to Binder_*
limit number of extra binder threads in SF to 4
Mathias Agopian [Fri, 8 Mar 2013 20:29:52 +0000 (20:29 +0000)]
am
6b2b7009: Merge changes Ibb3b6ff0,I2341e20c into jb-mr2-dev
* commit '
6b2b7009560964ed25cde06602872dff763b09f4':
rename binder services main thread to Binder_*
limit number of extra binder threads in SF to 4
Mathias Agopian [Fri, 8 Mar 2013 20:28:42 +0000 (20:28 +0000)]
Merge changes Ibb3b6ff0,I2341e20c into jb-mr2-dev
* changes:
rename binder services main thread to Binder_*
limit number of extra binder threads in SF to 4
Jesse Hall [Thu, 7 Mar 2013 23:14:18 +0000 (15:14 -0800)]
When disconnecting a surface, cancel don't queue the buffer
This isn't really right either, but avoids having an extra buffer that
the consumer has to drain which it might not be expecting.
To be correct, disconnecting a surface from a context should retain
the current buffer and continue using it when reconnected. The buffer
should only be canceled when the surface is destroyed. That will wait
for a later change.
Bug:
8320762
Change-Id: I5efa39c741193ca4f5612ea9de001ccbb683b345
Jesse Hall [Thu, 7 Mar 2013 17:56:26 +0000 (09:56 -0800)]
Defer destroying surfaces until not current
Bug:
8320762
Change-Id: I1320cf87923bcc5b795a86a13193363a49e29653
Jesse Hall [Thu, 7 Mar 2013 23:49:13 +0000 (23:49 +0000)]
am
1fd01cec: am
49385ec7: Merge "When disconnecting a surface, cancel don\'t queue the buffer" into jb-mr2-dev
* commit '
1fd01cecf5af5a616f814a154ba2c217eac14bd1':
When disconnecting a surface, cancel don't queue the buffer
Jesse Hall [Thu, 7 Mar 2013 23:47:04 +0000 (23:47 +0000)]
am
49385ec7: Merge "When disconnecting a surface, cancel don\'t queue the buffer" into jb-mr2-dev
* commit '
49385ec7c361347a69245c8a0838f6d03343a1de':
When disconnecting a surface, cancel don't queue the buffer
Jesse Hall [Thu, 7 Mar 2013 23:45:44 +0000 (23:45 +0000)]
am
12b528f8: am
86306b58: Merge "Defer destroying surfaces until not current" into jb-mr2-dev
* commit '
12b528f8ab017cd60a856166895e9cf6f8a4a404':
Defer destroying surfaces until not current
Jesse Hall [Thu, 7 Mar 2013 23:43:56 +0000 (23:43 +0000)]
Merge "When disconnecting a surface, cancel don't queue the buffer" into jb-mr2-dev
Jesse Hall [Thu, 7 Mar 2013 23:43:35 +0000 (23:43 +0000)]
am
86306b58: Merge "Defer destroying surfaces until not current" into jb-mr2-dev
* commit '
86306b587644e939c5b6d4a53d67c9b74ce24ba5':
Defer destroying surfaces until not current
Jesse Hall [Thu, 7 Mar 2013 23:41:45 +0000 (23:41 +0000)]
Merge "Defer destroying surfaces until not current" into jb-mr2-dev
Mathias Agopian [Thu, 7 Mar 2013 23:34:28 +0000 (15:34 -0800)]
rename binder services main thread to Binder_*
When a binder service's main thread joins the thread pool
it retains its name (whatever the exec name was), which is
very confusing in systrace.
we now rename that thread just like its friends in the
thread pool.
Change-Id: Ibb3b6ff07304b247cfc6fb1694e72350c579513e
Mathias Agopian [Thu, 7 Mar 2013 23:32:47 +0000 (15:32 -0800)]
limit number of extra binder threads in SF to 4
it should be enough and it makes debugging easier.
Bug:
6609290
Change-Id: I2341e20cfcfde184fe1ed9b925215f8fa3481ced
Jesse Hall [Thu, 7 Mar 2013 23:14:18 +0000 (15:14 -0800)]
When disconnecting a surface, cancel don't queue the buffer
This isn't really right either, but avoids having an extra buffer that
the consumer has to drain which it might not be expecting.
To be correct, disconnecting a surface from a context should retain
the current buffer and continue using it when reconnected. The buffer
should only be canceled when the surface is destroyed. That will wait
for a later change.
Bug:
8320762
Change-Id: I5efa39c741193ca4f5612ea9de001ccbb683b345
Jesse Hall [Thu, 7 Mar 2013 17:56:26 +0000 (09:56 -0800)]
Defer destroying surfaces until not current
Bug:
8320762
Change-Id: I1320cf87923bcc5b795a86a13193363a49e29653
Jean-Baptiste Queru [Thu, 7 Mar 2013 20:16:52 +0000 (20:16 +0000)]
am
f092d118: am
6c337e7a: resolved conflicts for merge of
bfb2aa46 to jb-mr2-dev
* commit '
f092d1188ee150cc3a1427a1ac57e0b5aa0d8b6b':
Tweaks for forward compatibility
Jean-Baptiste Queru [Thu, 7 Mar 2013 20:14:05 +0000 (20:14 +0000)]
am
6c337e7a: resolved conflicts for merge of
bfb2aa46 to jb-mr2-dev
* commit '
6c337e7a663c1049e58e0051bd7bfba61614ef37':
Tweaks for forward compatibility
Jean-Baptiste Queru [Thu, 7 Mar 2013 19:35:19 +0000 (11:35 -0800)]
resolved conflicts for merge of
bfb2aa46 to jb-mr2-dev
Jean-Baptiste Queru [Thu, 7 Mar 2013 19:08:08 +0000 (19:08 +0000)]
Merge "Tweaks for forward compatibility"
Mathias Agopian [Thu, 7 Mar 2013 17:34:34 +0000 (17:34 +0000)]
am
d56f8eff: am
3cd153a0: another attempt to fix the build
* commit '
d56f8effd65a0aefcca2f7f685b85b3deeed7090':
another attempt to fix the build
Mathias Agopian [Thu, 7 Mar 2013 17:34:34 +0000 (17:34 +0000)]
am
2e830128: am
84b470d7: attempt to fix build
* commit '
2e8301282296d20d03b0f149a3351ef38a04fba9':
attempt to fix build
Mathias Agopian [Thu, 7 Mar 2013 17:34:33 +0000 (17:34 +0000)]
am
483fbb3b: am
1f758231: Merge changes I7f696e42,I51c6df3c into jb-mr2-dev
* commit '
483fbb3befcfc5d113cf5931cbf32e59a99c21c6':
Make GraphicBuffer a RefBase
Fix RefBase debugging. O_CREAT must specify the mode.
Mathias Agopian [Thu, 7 Mar 2013 17:34:33 +0000 (17:34 +0000)]
am
494db35f: am
2be4e8ff: workaround to fix screenshot leak on N4
* commit '
494db35f9cdb079face7767e004c479048f57673':
workaround to fix screenshot leak on N4
Mathias Agopian [Thu, 7 Mar 2013 17:31:05 +0000 (17:31 +0000)]
am
3cd153a0: another attempt to fix the build
* commit '
3cd153a0330d4234a536fc5f4e4346413bde5a44':
another attempt to fix the build
Mathias Agopian [Thu, 7 Mar 2013 17:31:04 +0000 (17:31 +0000)]
am
84b470d7: attempt to fix build
* commit '
84b470d78f10b6fbfbf84edba749e5f7f315fc3a':
attempt to fix build
Mathias Agopian [Thu, 7 Mar 2013 17:30:57 +0000 (17:30 +0000)]
am
1f758231: Merge changes I7f696e42,I51c6df3c into jb-mr2-dev
* commit '
1f758231c26261bd6ef3ec869ce230c06ed5b596':
Make GraphicBuffer a RefBase
Fix RefBase debugging. O_CREAT must specify the mode.
Mathias Agopian [Thu, 7 Mar 2013 17:30:55 +0000 (17:30 +0000)]
am
2be4e8ff: workaround to fix screenshot leak on N4
* commit '
2be4e8ff23f24285f4c195ba5537c7a51c13be4d':
workaround to fix screenshot leak on N4
The Android Automerger [Thu, 7 Mar 2013 13:55:48 +0000 (05:55 -0800)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Mathias Agopian [Thu, 7 Mar 2013 06:37:33 +0000 (22:37 -0800)]
another attempt to fix the build
Change-Id: Ie0245db97170cca9a2cd8783b0fd512daf0d30a6
Mathias Agopian [Thu, 7 Mar 2013 05:34:39 +0000 (21:34 -0800)]
attempt to fix build
Change-Id: Ifb186d2f157ad02f593bf9b681aab53575f183ce
Mathias Agopian [Thu, 7 Mar 2013 04:52:24 +0000 (04:52 +0000)]
Merge changes I7f696e42,I51c6df3c into jb-mr2-dev
* changes:
Make GraphicBuffer a RefBase
Fix RefBase debugging. O_CREAT must specify the mode.
Mathias Agopian [Thu, 7 Mar 2013 04:42:56 +0000 (20:42 -0800)]
workaround to fix screenshot leak on N4
Bug:
8322020
Change-Id: Ie60af0eb431866b8d64b2674ae7bd8b5ee05f5d6
Mathias Agopian [Thu, 7 Mar 2013 02:50:52 +0000 (18:50 -0800)]
Make GraphicBuffer a RefBase
- this gives us access to RefBase's refcounting debugging
- it doesn't cost much because GraphicBuffer already has a vtable
Change-Id: I7f696e421fea14b14bfaeb83880689b83e96af4d
Mathias Agopian [Thu, 7 Mar 2013 01:51:15 +0000 (17:51 -0800)]
Fix RefBase debugging. O_CREAT must specify the mode.
Change-Id: I51c6df3cfd59b20ca73c3edee86bc2f74dbde1b1