Jamie Gennis
3e669cca86
am a461269d: am 2a8f8d57: Merge "Quiet the SurfaceFlingerClient dequeueBuffer error." into honeycomb
...
* commit 'a461269d458b29f1e44ba66f6f4ef6b711013705':
Quiet the SurfaceFlingerClient dequeueBuffer error.
2011-01-28 14:18:09 -08:00
Jamie Gennis
a461269d45
am 2a8f8d57: Merge "Quiet the SurfaceFlingerClient dequeueBuffer error." into honeycomb
...
* commit '2a8f8d57d23a171eaa367faa143f45fdd2f9cc1c':
Quiet the SurfaceFlingerClient dequeueBuffer error.
2011-01-28 14:15:44 -08:00
Jamie Gennis
2a8f8d57d2
Merge "Quiet the SurfaceFlingerClient dequeueBuffer error." into honeycomb
2011-01-28 14:12:57 -08:00
Jamie Gennis
6913062faa
Quiet the SurfaceFlingerClient dequeueBuffer error.
...
This is a temporary WAR for the case where dequeueBuffer is called when
all the buffers owned by a SurfaceTexture are not available - either
they're the current texture buffer or the next one. Currently, an error
is returned in that case, and this change just prevents that error from
being logged. In the future this will be fixed to not return an error
in that case.
Bug: 3356050
Change-Id: Ic6cc304881a63ce134cfd0bcb4265e3e3fa94b6a
2011-01-28 12:08:18 -08:00
Dianne Hackborn
564eb77ffe
am bb609471: am 256a09b2: Merge "Fix issue #3392073 : At times soft keyboard comes up in..." into honeycomb
...
* commit 'bb6094718b08e7fe2054b7260a85baae635afe48':
Fix issue #3392073 : At times soft keyboard comes up in...
2011-01-27 22:53:20 -08:00
Dianne Hackborn
bb6094718b
am 256a09b2: Merge "Fix issue #3392073 : At times soft keyboard comes up in..." into honeycomb
...
* commit '256a09b2fa5cc06775818428de771c7957403452':
Fix issue #3392073 : At times soft keyboard comes up in...
2011-01-27 22:50:56 -08:00
Dianne Hackborn
256a09b2fa
Merge "Fix issue #3392073 : At times soft keyboard comes up in..." into honeycomb
2011-01-27 22:48:58 -08:00
Romain Guy
8cd3752284
am 24c29867: am d0b54a73: Merge "Add more debug info for profiling." into honeycomb
...
* commit '24c29867a6851ce2c692a0ea61918d37dcb8e8e0':
Add more debug info for profiling.
2011-01-27 22:35:13 -08:00
Romain Guy
24c29867a6
am d0b54a73: Merge "Add more debug info for profiling." into honeycomb
...
* commit 'd0b54a73941aa5541ed1adc48f6739bda132970b':
Add more debug info for profiling.
2011-01-27 22:33:02 -08:00
Romain Guy
d0b54a7394
Merge "Add more debug info for profiling." into honeycomb
2011-01-27 22:30:57 -08:00
Dianne Hackborn
e75d87266b
Fix issue #3392073 : At times soft keyboard comes up in...
...
...gallery while attaching picture to gmail message
In various places we could block switching the IME target incorrectly.
Change-Id: I7e647fb35f4ea6f2e39eb7efd911420ea9ee64fa
2011-01-27 21:56:33 -08:00
Jason Sams
7e5fda6ba9
am 3e232f1c: am 386ef6da: Merge "Fix another barrier bug 3333866 Atomically update put." into honeycomb
...
* commit '3e232f1c59eb95a7d3b5b3ea411a383b7a8f1b5b':
Fix another barrier bug 3333866 Atomically update put.
2011-01-27 21:28:22 -08:00
Jason Sams
3e232f1c59
am 386ef6da: Merge "Fix another barrier bug 3333866 Atomically update put." into honeycomb
...
* commit '386ef6da5a95243b4a55b3f760621260e20a5e39':
Fix another barrier bug 3333866 Atomically update put.
2011-01-27 21:26:15 -08:00
Jason Sams
386ef6da5a
Merge "Fix another barrier bug 3333866 Atomically update put." into honeycomb
2011-01-27 21:24:00 -08:00
Stephen Hines
b7ea5ed2e5
am 6059c395: am 55f8f121: Merge "Correctly free resouces bound to scripts when the scripts are deleted." into honeycomb
...
* commit '6059c3955d739ab5fad15f9bf6bb6f743a9b5ac2':
Correctly free resouces bound to scripts when the scripts are deleted.
2011-01-27 19:44:36 -08:00
Stephen Hines
6059c3955d
am 55f8f121: Merge "Correctly free resouces bound to scripts when the scripts are deleted." into honeycomb
...
* commit '55f8f12119ad2fbb6afcb7647a1a18f4aa86f0f5':
Correctly free resouces bound to scripts when the scripts are deleted.
2011-01-27 19:42:20 -08:00
Jason Sams
38f8d9d7a1
Correctly free resouces bound to scripts when the scripts are deleted.
...
Change-Id: Idfcc30f1a7de0badeb6d8254ed508938d89f4070
b: 3381615
2011-01-27 19:36:54 -08:00
Romain Guy
885153e2d0
Add more debug info for profiling.
...
Change-Id: I0c74e2aa108142cc6ddac4577ae2d0fe6c0ddb25
2011-01-27 18:34:41 -08:00
Jason Sams
5012a8fe42
Fix another barrier bug 3333866
...
Atomically update put.
Change-Id: Id6d4b5c03f5562b3021561e95966a01abd293667
2011-01-27 18:08:40 -08:00
Mathias Agopian
50f7830c55
am 72abf01a: Merge "Fix the ISurfaceComposer onTransact switch." into gingerbread
...
* commit '72abf01a8b6958ac1f86d36302a8462c4f51fd9d':
Fix the ISurfaceComposer onTransact switch.
2011-01-27 11:24:33 -08:00
Chet Haase
82782446cd
am fcf51a67: am a45c056e: Merge "Fix display List bugs" into honeycomb
...
* commit 'fcf51a67967a402bf2178c3d0e09828e8942cade':
Fix display List bugs
2011-01-26 23:55:50 -08:00
Chet Haase
fcf51a6796
am a45c056e: Merge "Fix display List bugs" into honeycomb
...
* commit 'a45c056e62be0ca97edbdd6f6660822cf453c886':
Fix display List bugs
2011-01-26 23:51:58 -08:00
Chet Haase
a45c056e62
Merge "Fix display List bugs" into honeycomb
2011-01-26 23:49:23 -08:00
Romain Guy
a1eb2ff008
am 38f34ed2: am 7c53a0d6: Merge "Don\'t draw the same triangles several times. Bug #3388197 " into honeycomb
...
* commit '38f34ed20a52d027cbf1b72fe22c6d616810613b':
Don't draw the same triangles several times. Bug #3388197
2011-01-26 22:49:13 -08:00
Romain Guy
38f34ed20a
am 7c53a0d6: Merge "Don\'t draw the same triangles several times. Bug #3388197 " into honeycomb
...
* commit '7c53a0d6078620df3abc4997acfe267ef903f5c6':
Don't draw the same triangles several times. Bug #3388197
2011-01-26 22:47:01 -08:00
Chet Haase
678e0adbdb
Fix display List bugs
...
Various property setters in View need to invalidate the parent's
cache to get redrawn properly when accelerated with display lists.
Also, fix logic around display lists and old-style Animations in
ViewGroup.
Change-Id: I70e1c2fa49e62228ee4a1301a006ce50bda4c305
2011-01-26 22:44:52 -08:00
Romain Guy
4f09f5417b
Don't draw the same triangles several times.
...
Bug #3388197
Change-Id: Ief1dfd9447f144e9992340a173d2893e5e049129
2011-01-26 22:45:16 -08:00
Shih-wei Liao
783d0db712
am 957ee34d: am b9d69d59: Merge "For rs_cl, fix _RS_STATIC (used while we do on-host linking). Now we do on-device linking, STATIC no longer makes sense. (b/2943524)" into honeycomb
...
* commit '957ee34d73e6b0bec91edaad57be641834855758':
For rs_cl, fix _RS_STATIC (used while we do on-host linking). Now we do on-device linking, STATIC no longer makes sense. (b/2943524)
2011-01-26 19:11:15 -08:00
Stephen Hines
39530e77e5
Actually fix build.
...
Change-Id: I43cb042b0b8c8ac0f2e5fd9aee823298f9c29820
2011-01-26 18:07:47 -08:00
Shih-wei Liao
957ee34d73
am b9d69d59: Merge "For rs_cl, fix _RS_STATIC (used while we do on-host linking). Now we do on-device linking, STATIC no longer makes sense. (b/2943524)" into honeycomb
...
* commit 'b9d69d595fa17ae87b4e615c2339df64a5df8324':
For rs_cl, fix _RS_STATIC (used while we do on-host linking). Now we do on-device linking, STATIC no longer makes sense. (b/2943524)
2011-01-26 18:03:31 -08:00
Shih-wei Liao
26e5ff8a67
For rs_cl, fix _RS_STATIC (used while we do on-host linking). Now we do
...
on-device linking, STATIC no longer makes sense. (b/2943524)
Change-Id: Ia35f90eb0956b1cd6c436a1482d87d82f41cedc9
2011-01-26 17:04:31 -08:00
Stephen Hines
7c4a66be94
Fix build breakage.
...
Change-Id: I3fc80c719e7bfa2940af9257f46694232c0162a3
2011-01-26 15:51:29 -08:00
Shih-wei Liao
88523f3757
am dde78c2b: am 79204b98: Merge "Part II of fixing b/2943524: On-device linking rs_core." into honeycomb
...
* commit 'dde78c2b1c2c2ea28b6799ac135477386ae5df93':
Part II of fixing b/2943524: On-device linking rs_core.
2011-01-26 15:00:44 -08:00
Shih-wei Liao
dde78c2b1c
am 79204b98: Merge "Part II of fixing b/2943524: On-device linking rs_core." into honeycomb
...
* commit '79204b98d260d8f5e8419f5149b31b336424aec5':
Part II of fixing b/2943524: On-device linking rs_core.
2011-01-26 14:58:57 -08:00
Shih-wei Liao
79204b98d2
Merge "Part II of fixing b/2943524: On-device linking rs_core." into honeycomb
2011-01-26 14:56:41 -08:00
Shih-wei Liao
f5a16efcc3
Part II of fixing b/2943524: On-device linking rs_core.
...
Change-Id: I1db1f8a2c9e8afabd9961c0effca60b10c9ed4dc
2011-01-26 14:47:17 -08:00
Stephen Hines
6b193fed09
am 203107d4: am 8fc7690f: Merge "Hook up tgammaf properly for RS." into honeycomb
...
* commit '203107d4901704c33eca2e5f7e5cd967fd372bbe':
Hook up tgammaf properly for RS.
2011-01-26 14:13:06 -08:00
Stephen Hines
203107d490
am 8fc7690f: Merge "Hook up tgammaf properly for RS." into honeycomb
...
* commit '8fc7690f2b42c27f9f609647b96c17234aa9d78e':
Hook up tgammaf properly for RS.
2011-01-26 14:10:58 -08:00
Stephen Hines
8fc7690f2b
Merge "Hook up tgammaf properly for RS." into honeycomb
2011-01-26 14:08:49 -08:00
Romain Guy
cf5afe9299
am 08cdf6fd: am 940df6dd: Merge "Remove unused API" into honeycomb
...
* commit '08cdf6fd9ac9bbbd77024518c45034d66b5830c6':
Remove unused API
2011-01-26 13:44:35 -08:00
Romain Guy
08cdf6fd9a
am 940df6dd: Merge "Remove unused API" into honeycomb
...
* commit '940df6dd83624e5f46b147837d848853a1dab9b2':
Remove unused API
2011-01-26 13:42:53 -08:00
Romain Guy
940df6dd83
Merge "Remove unused API" into honeycomb
2011-01-26 13:41:10 -08:00
Romain Guy
2b1847ea60
Remove unused API
...
Change-Id: I1714fd82a64b752f0350ef4ef9179ce19e089c6a
2011-01-26 13:43:01 -08:00
Stephen Hines
d6a5b40cc7
Hook up tgammaf properly for RS.
...
Change-Id: I9b489cbfe49b3c01028f23c1123bc272e100c60e
b: 3370708, 2933146
2011-01-26 12:31:36 -08:00
Jason Sams
83af70126f
am e0fc4b70: Merge "DO NOT MERGE Remove the rs_quaternion functions until mr1" into honeycomb
...
* commit 'e0fc4b70f812cef4c8850be91b008e75b28757f3':
DO NOT MERGE Remove the rs_quaternion functions until mr1
2011-01-26 11:57:12 -08:00
Jason Sams
2e42038d4e
am e361ca64: Merge "Migrating functions for on device linking." into honeycomb
...
* commit 'e361ca6428e137410ab828f5dee6148b8bdc29b3':
Migrating functions for on device linking.
2011-01-26 11:57:08 -08:00
Jason Sams
e0fc4b70f8
Merge "DO NOT MERGE Remove the rs_quaternion functions until mr1" into honeycomb
2011-01-26 11:54:38 -08:00
Jason Sams
e361ca6428
Merge "Migrating functions for on device linking." into honeycomb
2011-01-26 11:54:33 -08:00
Jason Sams
ca11318ac0
DO NOT MERGE
...
Remove the rs_quaternion functions until mr1
Change-Id: I1c48624a308ce6f5c4a13215170f34c810b4cf00
2011-01-26 11:16:23 -08:00
Shih-wei Liao
969b3ae440
am 39740e1e: Merge "Fix b/2943524: On-device linking the rs_cl." into honeycomb
...
* commit '39740e1e96baa9db399ef2bdc236974b3ae049af':
Fix b/2943524: On-device linking the rs_cl.
2011-01-26 10:39:46 -08:00