Elliott Hughes
36df426dbc
Merge "Use an @hide libcore API to get the FileDescriptor from a Socket."
2011-04-13 10:18:03 -07:00
Elliott Hughes
fd272c251c
Merge "Don't allocate a raw object then call its constructor manually..."
2011-04-13 10:17:46 -07:00
Wu-cheng Li
89675f7611
Merge "Add camera metering area API."
2011-04-13 01:14:42 -07:00
Wink Saville
21d7782cb3
am 05be003f: am c078a436: Merge "Fix occasional phone app crash" into honeycomb-LTE
...
* commit '05be003f7f3dd758c44c2cdb3e7aa638d8daa446':
Fix occasional phone app crash
2011-04-12 17:03:29 -07:00
Wink Saville
71d21b7efb
am c078a436: Merge "Fix occasional phone app crash" into honeycomb-LTE
...
* commit 'c078a4362791cec3976c4312d3f7e0e96b3487bf':
Fix occasional phone app crash
2011-04-12 17:00:57 -07:00
Wink Saville
36fb943450
Merge "Fix occasional phone app crash" into honeycomb-LTE
2011-04-12 16:53:54 -07:00
Elliott Hughes
5ac1fcab91
Merge "Remove useless forward declarations."
2011-04-12 16:29:49 -07:00
David Li
c2ca836b17
GLES2Dbg: added CaptureDraw and CaptureSwap options
...
CaptureDraw specifies how many glDrawArrays/Elements to glReadPixel
CaptureSwap similarly applies to eglSwapBuffers
Change-Id: Ie7a7e3392b4ecdc0659dcee04f4bab97c35267dc
Signed-off-by: David Li <davidxli@google.com>
2011-04-12 15:56:10 -07:00
David Li
499c6f02e6
GLES2Dbg: use dump.gles2dbg file when fails to create socket
...
setprop debug.egl.debug_forceUseFile 1: always use file
setprop debug.egl.debug_maxFileSize <int MB>: exit when reached
setprop debug.egl.debug_filePath <path>: may need to make the file
writable first.
setprop debug.egl.debug_port <unsigned short>
setprop debug.egl.debug_proc <proc cmdline>: to match debuggee process
Change-Id: I34ca1f3092f3abf17e2ded9d1689d0cdef6e07e8
Signed-off-by: David Li <davidxli@google.com>
2011-04-12 15:56:10 -07:00
David Li
904f18f792
GLES2Dbg: add EXTEND_AFTER_CALL_Debug_* macro and improve protocol
...
To allow auto generate of Debug_glReadPixels function.
Also added AfterGeneratedCall messag type, and client override
of expectResponse for improving protocol.
Also implemented callers for client to get shader/program iv & infolog
Change-Id: I8426de0be4b7ffcb8b2b4f063ad85d19a9d2d72e
Signed-off-by: David Li <davidxli@google.com>
2011-04-12 15:56:10 -07:00
David Li
864f839e96
GLES2Dbg: change GLES2_dbg to shared library
...
Change-Id: I493e9bff431bd939f4e80e1e9c614dd557307fa2
Signed-off-by: David Li <davidxli@google.com>
2011-04-12 15:56:10 -07:00
Kenny Root
029b92251a
Merge "Updated system packages retain shared user"
2011-04-12 15:34:42 -07:00
Scott Main
8f745c9c8e
am bf3452f3: am 34b42b2d: am 7e8902a9: am f42937a8: docs: fix doc typo
...
* commit 'bf3452f36c768808873e5428e3594c7eaec0a10c':
docs: fix doc typo
2011-04-12 14:55:32 -07:00
Scott Main
e69ed721c9
am 34b42b2d: am 7e8902a9: am f42937a8: docs: fix doc typo
...
* commit '34b42b2ded4741e68413d0aa39f3af146629dcec':
docs: fix doc typo
2011-04-12 14:52:30 -07:00
Scott Main
c2b8995c9a
am 7e8902a9: am f42937a8: docs: fix doc typo
...
* commit '7e8902a90566bf05c9bc12f87f4149fc6e3c00a4':
docs: fix doc typo
2011-04-12 14:48:30 -07:00
Scott Main
281c94f89d
am f42937a8: docs: fix doc typo
...
* commit 'f42937a8aa0af6b22d8a2a43a9bfc07c38aeffb5':
docs: fix doc typo
2011-04-12 14:44:02 -07:00
Eric Fischer
ff4c71e7d5
am 70cf1b97: (-s ours) am 68cb0ffa: (-s ours) am 71a556f2: Import revised translations. DO NOT MERGE
...
* commit '70cf1b97586a4f1ffa04fe0d83c3590fc22f6a56':
Import revised translations. DO NOT MERGE
2011-04-12 13:28:14 -07:00
Scott Main
51f58bf44a
am 6ce11bb0: am 91470be4: am c7b94371: am b9fedd97: docs: fix broken links
...
* commit '6ce11bb0e1d8e0366f4321f90826d60ee1e52193':
docs: fix broken links
2011-04-12 13:27:43 -07:00
Bill Gruber
1b148ab903
am e3aa4ec6: am a8c68be8: am df8fc2e1: am 9a693ed9: Doc fix-corrects the cited download locations
...
* commit 'e3aa4ec6b1c0d1e732fb686c0d8adc7d729b6fc6':
Doc fix-corrects the cited download locations
2011-04-12 13:27:38 -07:00
Eric Fischer
17230ed6b1
am 68cb0ffa: (-s ours) am 71a556f2: Import revised translations. DO NOT MERGE
...
* commit '68cb0ffad05323dc1df7faeefa8f41586744c293':
Import revised translations. DO NOT MERGE
2011-04-12 13:18:52 -07:00
Scott Main
efeed54cb5
am 91470be4: am c7b94371: am b9fedd97: docs: fix broken links
...
* commit '91470be46644493be89dc277f3c0f987f34bc937':
docs: fix broken links
2011-04-12 13:08:50 -07:00
Scott Main
372f5c0ed2
am c7b94371: am b9fedd97: docs: fix broken links
...
* commit 'c7b94371a0a4cbe853c17c4610a564a5a4d3efd5':
docs: fix broken links
2011-04-12 13:06:50 -07:00
Scott Main
6b923ae419
am b9fedd97: docs: fix broken links
...
* commit 'b9fedd9771a6aedf068155fd91f15baf52e668cd':
docs: fix broken links
2011-04-12 13:02:43 -07:00
Eric Fischer
b7b75cbe6d
am 71a556f2: Import revised translations. DO NOT MERGE
...
* commit '71a556f24e2b8d489bf81b22fab6fe5e99a9eae0':
Import revised translations. DO NOT MERGE
2011-04-12 13:02:15 -07:00
Kenny Root
81bc567745
resolved conflicts for merge of 18490fb9 to master
...
Change-Id: I6c68e6fb0f9c1182a955689bbffc161a8f30bd37
2011-04-12 12:51:08 -07:00
Bill Gruber
a3a19c84bc
am a8c68be8: am df8fc2e1: am 9a693ed9: Doc fix-corrects the cited download locations
...
* commit 'a8c68be89d3735e5d579e521d0798032303330d3':
Doc fix-corrects the cited download locations
2011-04-12 12:42:26 -07:00
Bill Gruber
46fe2b098d
am df8fc2e1: am 9a693ed9: Doc fix-corrects the cited download locations
...
* commit 'df8fc2e1bfb6abcbea107636f36fae464faf976f':
Doc fix-corrects the cited download locations
2011-04-12 12:23:33 -07:00
Elliott Hughes
d80cc88854
Merge "More native code cleanup."
2011-04-12 12:09:01 -07:00
Andy McFadden
32cd0784a7
Merge "Fix typos."
2011-04-12 12:02:36 -07:00
Bill Gruber
af40f2d47d
am 9a693ed9: Doc fix-corrects the cited download locations
...
* commit '9a693ed9870cf2d5817a3bfc8dc0fbec4456a3c2':
Doc fix-corrects the cited download locations
2011-04-12 11:48:00 -07:00
Doug Zongker
0da4f3c965
Merge "protect all /cache/recovery/last_* files from deletion"
2011-04-12 11:30:47 -07:00
Kenny Root
f6bbefd581
resolved conflicts for merge of 87b3c0dc to honeycomb-plus-aosp
...
Change-Id: Ia1a0024aabf531438203eb9fea3a10dd15eabe53
2011-04-12 10:27:15 -07:00
Elliott Hughes
d61378ffbf
Merge "Kill the global references in the OpenGL wrappers."
2011-04-12 10:19:11 -07:00
Andreas Huber
09a75f337b
Merge "Experimental support for changing the video surface/texture on an active mediaplayer"
2011-04-12 09:25:32 -07:00
Andreas Huber
c275555ed3
Merge "If the media extractor specifies an invalid thumbnail time, default to the first frame."
2011-04-12 08:36:59 -07:00
Mathias Agopian
7a042bf324
changes to SurfaceTexture needed for unification with SF
...
- implement connect/disconnect
- implement missing query
- handle texture_2d in addition to texture_external_oes
Change-Id: I971a70821f00f22b01f5337de4a7d451177fec4d
2011-04-11 21:19:55 -07:00
Benoit Goby
d810610fe1
am 0b9b8711: am 43be7a61: EthernetDataTracker: implement setDependencyMet
...
* commit '0b9b8711a1a2107dc913cc751b7d981fce4f3082':
EthernetDataTracker: implement setDependencyMet
2011-04-11 20:26:41 -07:00
Benoit Goby
77e4ad4610
am 43be7a61: EthernetDataTracker: implement setDependencyMet
...
* commit '43be7a6120d9dd2ee0902de2322aec2ee75b0351':
EthernetDataTracker: implement setDependencyMet
2011-04-11 20:23:42 -07:00
Benoit Goby
9034a564a1
resolved conflicts for merge of 31659471 to master
...
Change-Id: Ib49a1ef39455af8b01c3feb7fcb5393e0a4ceec9
2011-04-11 19:07:11 -07:00
Benoit Goby
f3a0fcc94b
am 2869d171: resolved conflicts for merge of 08c39c6a to honeycomb-LTE
...
* commit '2869d1715d815ef2b357bf182d384515cdf6f9ab':
Add support for USB Ethernet adapters
2011-04-11 18:53:57 -07:00
Benoit Goby
29d013afa9
resolved conflicts for merge of 08c39c6a to honeycomb-LTE
...
Change-Id: I79f8ac1dc8ff9f5d0559d37043b850cd26246b92
2011-04-11 18:41:23 -07:00
Brad Fitzpatrick
904771fc14
am 07c25b65: am 4430670f: am ca7ad44a: Merge "audioflinger: Enable ARMv5TE optimized resampler"
...
* commit '07c25b651216daac884bd503c02b788418165b50':
audioflinger: Enable ARMv5TE optimized resampler
2011-04-11 17:32:37 -07:00
Xavier Ducrohet
e277418b1d
am 1f2a307b: resolved conflicts for merge of 4754c79a to honeycomb-plus-aosp
...
* commit '1f2a307b59a6f1d61390425b52c3f0aafc21c54b':
LayoutLib: don't render when shader's local matrix is set to 0 scale.
2011-04-11 17:28:59 -07:00
Elliott Hughes
ca24574eec
Merge "You don't need to poke around inside FileDescriptor manually."
2011-04-11 17:27:53 -07:00
Brad Fitzpatrick
e80ff06e1c
am 4430670f: am ca7ad44a: Merge "audioflinger: Enable ARMv5TE optimized resampler"
...
* commit '4430670f48f75661293371dab8db55865f5f56e0':
audioflinger: Enable ARMv5TE optimized resampler
2011-04-11 17:27:12 -07:00
Xavier Ducrohet
f2ab6bc15f
resolved conflicts for merge of 4754c79a to honeycomb-plus-aosp
...
Change-Id: I3e7bd605e08be0c45533d4c9193727bbf413d342
2011-04-11 17:11:41 -07:00
Xavier Ducrohet
1ab7cfec03
am fc1bf925: resolved conflicts for merge of efa98a29 to honeycomb-plus-aosp
...
* commit 'fc1bf9256372018188468b8ba5163ac5dcc74f56':
Merge c5aeac7f from honeycomb.
2011-04-11 16:33:12 -07:00
Gilles Debunne
0edbcb20ce
Merge "Fix in BreakIterator."
2011-04-11 16:21:38 -07:00
Xavier Ducrohet
b5acb8d716
resolved conflicts for merge of efa98a29 to honeycomb-plus-aosp
...
Change-Id: Id5fe9a8cc322a10e1a0b726c33b5dc9091e44701
2011-04-11 16:15:54 -07:00
Kenny Root
8a1a615176
am 08d9d9a4: Merge "Runtime resource overlay, iteration 1."
...
* commit '08d9d9a46250c4fad66e9b637e8898a3524c4286':
Runtime resource overlay, iteration 1.
2011-04-11 15:33:19 -07:00