ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
48,298 Commits 2 Branches 0 Tags 54 MiB
eda14c1bef
Commit Graph

48298 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jean-Baptiste Queru
75bcd73777 am 4ddcb758: (-s ours) am 9ef024ec: (-s ours) Reconcile with jb-mr1-release - do not merge 
* commit '4ddcb75861cfb2835fcc20f2071222d2f55450ba':
 2013-03-11 12:41:50 -07:00
jp abgrall
1e928f404f am 574d6902: am ba8abb51: Merge "Ensure dumpstate children die" 
* commit '574d6902b7e30a1e9c2375481549c8e8a712d6e6':
  Ensure dumpstate children die
 2013-03-11 19:34:13 +00:00
jp abgrall
574d6902b7 am ba8abb51: Merge "Ensure dumpstate children die" 
* commit 'ba8abb517d1eddebeda62bf907fa446e3c3b81f6':
  Ensure dumpstate children die
 2013-03-11 12:28:06 -07:00
Jean-Baptiste Queru
4ddcb75861 am 9ef024ec: (-s ours) Reconcile with jb-mr1-release - do not merge 
* commit '9ef024ec8ae0318c89cc65dc0591aa40695393fc':
 2013-03-11 12:23:09 -07:00
Jean-Baptiste Queru
9ef024ec8a Reconcile with jb-mr1-release - do not merge 2013-03-11 12:19:30 -07:00
jp abgrall
ba8abb517d Merge "Ensure dumpstate children die" 2013-03-11 18:09:35 +00:00
John Michelau
e7b6cf13f9 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
 2013-03-11 11:44:15 -05:00
The Android Automerger
2d8363e923 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-03-11 05:56:07 -07:00
Mathias Agopian
b1beeb4ab9 am d5776414: make sure to call compositionComplete after taking a screenshot 
* commit 'd577641411f067c93aabcd2acf7ce06862fb26d3':
  make sure to call compositionComplete after taking a screenshot
 2013-03-08 22:46:55 +00:00
Mathias Agopian
e491ec7c93 am 7589b2a7: add two libgui tests 
* commit '7589b2a7975cc3bc2a0659ab6503ceb3e4d94048':
  add two libgui tests
 2013-03-08 22:46:54 +00:00
Mathias Agopian
d577641411 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
 2013-03-08 13:54:46 -08:00
Mathias Agopian
7589b2a797 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
 2013-03-08 13:22:03 -08:00
Mathias Agopian
3f27f95033 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
 2013-03-08 20:29:52 +00:00
Mathias Agopian
6b2b700956 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
 2013-03-08 20:28:43 +00:00
Jesse Hall
f8cbf2c06c 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
 2013-03-07 18:35:35 -08:00
Jesse Hall
70b52f5ce2 Defer destroying surfaces until not current 
Bug: 8320762
Change-Id: I1320cf87923bcc5b795a86a13193363a49e29653
 2013-03-07 18:35:35 -08:00
Jesse Hall
1fd01cecf5 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
 2013-03-07 23:47:04 +00:00
Jesse Hall
49385ec7c3 Merge "When disconnecting a surface, cancel don't queue the buffer" into jb-mr2-dev 2013-03-07 23:43:56 +00:00
Jesse Hall
12b528f8ab am 86306b58: Merge "Defer destroying surfaces until not current" into jb-mr2-dev 
* commit '86306b587644e939c5b6d4a53d67c9b74ce24ba5':
  Defer destroying surfaces until not current
 2013-03-07 23:43:35 +00:00
Jesse Hall
86306b5876 Merge "Defer destroying surfaces until not current" into jb-mr2-dev 2013-03-07 23:41:45 +00:00
Mathias Agopian
e3e43b384e 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
 2013-03-07 15:34:28 -08:00
Mathias Agopian
649b976a00 limit number of extra binder threads in SF to 4 
it should be enough and it makes debugging easier.

Bug: 6609290
Change-Id: I2341e20cfcfde184fe1ed9b925215f8fa3481ced
 2013-03-07 15:32:47 -08:00
Jesse Hall
5f555569e7 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
 2013-03-07 15:21:26 -08:00
Jesse Hall
78141e3acc Defer destroying surfaces until not current 
Bug: 8320762
Change-Id: I1320cf87923bcc5b795a86a13193363a49e29653
 2013-03-07 15:10:59 -08:00
Jean-Baptiste Queru
f092d1188e am 6c337e7a: resolved conflicts for merge of bfb2aa46 to jb-mr2-dev 
* commit '6c337e7a663c1049e58e0051bd7bfba61614ef37':
  Tweaks for forward compatibility
 2013-03-07 20:14:05 +00:00
Jean-Baptiste Queru
6c337e7a66 resolved conflicts for merge of bfb2aa46 to jb-mr2-dev 2013-03-07 11:35:19 -08:00
Jean-Baptiste Queru
bfb2aa4652 Merge "Tweaks for forward compatibility" 2013-03-07 19:08:08 +00:00
Mathias Agopian
d56f8effd6 am 3cd153a0: another attempt to fix the build 
* commit '3cd153a0330d4234a536fc5f4e4346413bde5a44':
  another attempt to fix the build
 2013-03-07 17:31:05 +00:00
Mathias Agopian
2e83012822 am 84b470d7: attempt to fix build 
* commit '84b470d78f10b6fbfbf84edba749e5f7f315fc3a':
  attempt to fix build
 2013-03-07 17:31:04 +00:00
Mathias Agopian
483fbb3bef 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.
 2013-03-07 17:30:57 +00:00
Mathias Agopian
494db35f9c am 2be4e8ff: workaround to fix screenshot leak on N4 
* commit '2be4e8ff23f24285f4c195ba5537c7a51c13be4d':
  workaround to fix screenshot leak on N4
 2013-03-07 17:30:55 +00:00
The Android Automerger
314cdf8f5c merge in jb-mr2-release history after reset to jb-mr2-dev 2013-03-07 05:55:48 -08:00
Mathias Agopian
3cd153a033 another attempt to fix the build 
Change-Id: Ie0245db97170cca9a2cd8783b0fd512daf0d30a6
 2013-03-06 22:37:33 -08:00
Mathias Agopian
84b470d78f attempt to fix build 
Change-Id: Ifb186d2f157ad02f593bf9b681aab53575f183ce
 2013-03-06 21:34:39 -08:00
Mathias Agopian
1f758231c2 Merge changes I7f696e42,I51c6df3c into jb-mr2-dev 
* changes:
  Make GraphicBuffer a RefBase
  Fix RefBase debugging. O_CREAT must specify the mode.
 2013-03-07 04:52:24 +00:00
Mathias Agopian
2be4e8ff23 workaround to fix screenshot leak on N4 
Bug: 8322020

Change-Id: Ie60af0eb431866b8d64b2674ae7bd8b5ee05f5d6
 2013-03-06 20:44:16 -08:00
Mathias Agopian
e041716ba1 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
 2013-03-06 18:50:52 -08:00
Mathias Agopian
dbf146f1d6 Fix RefBase debugging. O_CREAT must specify the mode. 
Change-Id: I51c6df3cfd59b20ca73c3edee86bc2f74dbde1b1
 2013-03-06 17:52:34 -08:00
Mathias Agopian
dad8bd33d2 am 438ca07b: Merge changes I66511c08,Ia051949f,Ic7451365,I5b571a4c into jb-mr2-dev 
* commit '438ca07b6ba74235e87bfbd78c94874d8bbde391':
  Get rid of LayerBase.
  Make LayerDim a regular Layer instead of a LayerBase
  fold LayerBaseClient into LayerBase
  Remove support for ScreenshotLayer
 2013-03-07 01:49:25 +00:00
Mathias Agopian
438ca07b6b Merge changes I66511c08,Ia051949f,Ic7451365,I5b571a4c into jb-mr2-dev 
* changes:
  Get rid of LayerBase.
  Make LayerDim a regular Layer instead of a LayerBase
  fold LayerBaseClient into LayerBase
  Remove support for ScreenshotLayer
 2013-03-07 01:47:34 +00:00
Jean-Baptiste Queru
d82bea798e Tweaks for forward compatibility 
Change-Id: I136fcbbc14072ee5f5281d09445f28d083ed3ce1
 2013-03-06 15:26:54 -08:00
Jeff Sharkey
5062011324 am 175264b0: Return NO_MEMORY when glReadPixels() fails. 
* commit '175264b09c6080b29a23fc9f545d4b99445714bd':
  Return NO_MEMORY when glReadPixels() fails.
 2013-03-06 16:47:57 +00:00
The Android Automerger
b584442006 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-03-06 05:56:13 -08:00
Mathias Agopian
13127d8921 Get rid of LayerBase. 
The functionality of LayerBase and Layer is folded
into Layer. There wasn't a need for this abstraction
anymore.

Change-Id: I66511c08cc3d89009ba4deabf47e26cd4cfeaefb
 2013-03-05 19:52:30 -08:00
Mathias Agopian
2f73af9212 Make LayerDim a regular Layer instead of a LayerBase 
this is in preparation to get rid of LayerBase entirely

Change-Id: Ia051949fc5205fd87371331145356ee11598a597
 2013-03-05 19:52:30 -08:00
Mathias Agopian
b79f61d41e fold LayerBaseClient into LayerBase 
Change-Id: Ic745136522df59c42f0885fd969e75ea55d09f01
 2013-03-05 19:52:30 -08:00
Mathias Agopian
089a15298e Remove support for ScreenshotLayer 
Change-Id: I5b571a4cf3faa77d2c4aca916fa4bd00a1065bb9
 2013-03-05 19:52:29 -08:00
Jeff Sharkey
175264b09c Return NO_MEMORY when glReadPixels() fails. 
Change-Id: Ic66134ef457e8442ae9135e9ec50e3d02932a253
 2013-03-05 18:00:01 -08:00