Andreas Huber
b3ed29c713
am b9d7b46b: am 8f864513: Merge "Fix String8 to free its memory only after assignment operations based on pointers are finished in case that pointer referred to the string\'s original contents." into kraken
2010-06-10 16:13:18 -07:00
Andreas Huber
0e7355b9d0
am 960a0ff1: am c81d2c12: Merge "Initial check-in of new caching/prefetching data source implementation." into kraken
2010-06-10 16:13:11 -07:00
Brad Fitzpatrick
69a0299713
resolved conflicts for merge of f37cbe6b to master
...
Change-Id: I529b17e55b9668f900f685f92e9831e14a82db05
2010-06-10 15:58:22 -07:00
Andreas Huber
7385722784
am 8f864513: Merge "Fix String8 to free its memory only after assignment operations based on pointers are finished in case that pointer referred to the string\'s original contents." into kraken
2010-06-10 15:17:30 -07:00
Andreas Huber
4f1605b06d
am c81d2c12: Merge "Initial check-in of new caching/prefetching data source implementation." into kraken
2010-06-10 15:17:24 -07:00
Andreas Huber
8428e036ab
Merge "Fix String8 to free its memory only after assignment operations based on pointers are finished in case that pointer referred to the string's original contents." into kraken
2010-06-10 15:15:37 -07:00
Andreas Huber
5517af4491
Merge "Initial check-in of new caching/prefetching data source implementation." into kraken
2010-06-10 15:15:29 -07:00
Brad Fitzpatrick
3fc3c14a85
am 438d0595: Introduce "StrictMode"
2010-06-10 15:03:26 -07:00
Kenny Root
361e505eee
Merge "Move shaping to native."
2010-06-10 14:25:39 -07:00
Mike Lockwood
0641a0ccc5
Merge changes I99b3452f,Idda56860
...
* changes:
CameraBrowser: Display thumbnails for camera images.
MTP: Add support for retrieving thumbnails to MTP content provider.
2010-06-10 14:21:53 -07:00
Adam Powell
5d8178060c
am 45c3f843: am 8f1bfb00: am 8f2ca788: Merge "Fix bug 2757693 - Multi-touch coordinates can jump when a finger goes down." into froyo
2010-06-10 14:19:26 -07:00
Adam Powell
afbcb1193b
am 8f1bfb00: am 8f2ca788: Merge "Fix bug 2757693 - Multi-touch coordinates can jump when a finger goes down." into froyo
2010-06-10 14:16:32 -07:00
Adam Powell
07345784cb
am 8f2ca788: Merge "Fix bug 2757693 - Multi-touch coordinates can jump when a finger goes down." into froyo
...
Merge commit '8f2ca788f369892370477212cf9e7a67721a8c16' into kraken
* commit '8f2ca788f369892370477212cf9e7a67721a8c16':
Fix bug 2757693 - Multi-touch coordinates can jump when a finger goes down.
2010-06-10 14:13:51 -07:00
Adam Powell
a9d563290e
Merge "Fix bug 2757693 - Multi-touch coordinates can jump when a finger goes down." into froyo
2010-06-10 14:09:50 -07:00
Andreas Huber
eb09f5752e
am c90e35c1: am 8d300280: Merge "Support "pausing" of MediaSources with the effect that they no longer pull on their upstream source until a subsequent read-with-seek." into kraken
2010-06-10 12:43:53 -07:00
Andreas Huber
816af95c26
am 3ee447e4: am 75c1c8e3: Merge "Initial check in of a new http data source implementation." into kraken
2010-06-10 12:43:48 -07:00
Andreas Huber
ba3598e7c1
am 8d300280: Merge "Support "pausing" of MediaSources with the effect that they no longer pull on their upstream source until a subsequent read-with-seek." into kraken
2010-06-10 12:42:10 -07:00
Andreas Huber
c6d9172f67
am 75c1c8e3: Merge "Initial check in of a new http data source implementation." into kraken
2010-06-10 12:42:06 -07:00
Andreas Huber
84ccc74833
Merge "Support "pausing" of MediaSources with the effect that they no longer pull on their upstream source until a subsequent read-with-seek." into kraken
2010-06-10 12:41:05 -07:00
Andreas Huber
b537e5c360
Merge "Initial check in of a new http data source implementation." into kraken
2010-06-10 12:40:39 -07:00
Nick Kralevich
829818cdfd
am fc66fa53: (-s ours) am 9a9724c3: am a2c6d5bf: (-s ours) do not merge: cherry-picked 929b4855b8208d36272769e8eeaa6cd2823b94c0 from master branch
2010-06-10 11:58:59 -07:00
Nick Kralevich
eab454e14a
am 9a9724c3: am a2c6d5bf: (-s ours) do not merge: cherry-picked 929b4855b8208d36272769e8eeaa6cd2823b94c0 from master branch
2010-06-10 11:57:05 -07:00
Nick Kralevich
7984c8c7ab
am a2c6d5bf: (-s ours) do not merge: cherry-picked 929b4855b8208d36272769e8eeaa6cd2823b94c0 from master branch
...
Merge commit 'a2c6d5bf308181c019ade0aac6d25fe33dc3d76c' into kraken
* commit 'a2c6d5bf308181c019ade0aac6d25fe33dc3d76c':
do not merge: cherry-picked 929b4855b8208d36272769e8eeaa6cd2823b94c0 from master branch
2010-06-10 11:54:53 -07:00
Andreas Huber
a637eb4869
Fix String8 to free its memory only after assignment operations based on pointers are finished in case that pointer referred to the string's original contents.
...
Change-Id: I6961f3cf10ba3b728579ea63262db750a4cf8577
2010-06-10 11:25:51 -07:00
Irfan Sheriff
1337f4f975
Merge "Make NetworkStateTracker an interface"
2010-06-10 11:05:25 -07:00
James Dong
5c8ec1be48
am 3aede37f: am 3a0b37a0: Merge "Remove the lock/unlock workaround from CameraService" into kraken
2010-06-10 10:18:52 -07:00
Andreas Huber
a01c56d877
am 7b909c05: am 66b89a62: Merge "Apparently the TI video decoder only supports H.264 up to baseline profile/level 3, not level 3.x as previously assumed." into kraken
2010-06-10 10:17:04 -07:00
James Dong
83c15e016a
am 3a0b37a0: Merge "Remove the lock/unlock workaround from CameraService" into kraken
2010-06-10 10:16:55 -07:00
Andreas Huber
b2030f3bde
am 66b89a62: Merge "Apparently the TI video decoder only supports H.264 up to baseline profile/level 3, not level 3.x as previously assumed." into kraken
2010-06-10 10:14:50 -07:00
James Dong
c419e471fa
Merge "Remove the lock/unlock workaround from CameraService" into kraken
2010-06-10 10:14:38 -07:00
Andreas Huber
7f1c756f1a
Merge "Apparently the TI video decoder only supports H.264 up to baseline profile/level 3, not level 3.x as previously assumed." into kraken
2010-06-10 10:12:57 -07:00
Kenny Root
c71e562c6b
am c46f03e4: am 36921ad8: am b00854d4: Import revised translations
2010-06-09 22:35:55 -07:00
Kenny Root
b3eeac55a7
am 36921ad8: am b00854d4: Import revised translations
2010-06-09 22:33:47 -07:00
Kenny Root
c33a2fbd7c
am b00854d4: Import revised translations
...
Merge commit 'b00854d4c07ee8c810d1e32984543297bfa80a8e' into kraken
* commit 'b00854d4c07ee8c810d1e32984543297bfa80a8e':
Import revised translations
2010-06-09 22:31:32 -07:00
James Dong
fcd193c9fd
Remove the lock/unlock workaround from CameraService
...
bug - 2677772
Change-Id: I7c996daad8b3bfc89e9fa2d655dc18c9a5c68f2f
2010-06-09 21:30:43 -07:00
Dmitri Plotnikov
37bd20ed35
Merge "Adding a stopLoading() method."
2010-06-09 20:22:03 -07:00
Mathias Agopian
21f82d43d6
am e52d66fa: am 44bea8f8: Merge changes I00274431,I83be9404,I0359531a,Iceef1e95 into kraken
2010-06-09 19:57:01 -07:00
Mathias Agopian
75f7803107
am 44bea8f8: Merge changes I00274431,I83be9404,I0359531a,Iceef1e95 into kraken
2010-06-09 19:55:57 -07:00
Mathias Agopian
bb84a96acc
Merge changes I00274431,I83be9404,I0359531a,Iceef1e95 into kraken
...
* changes:
update EGL headers to the latest
update GL ES stub libraries with the new GL ES headers
fix OpenGL ES extension headers from khronos
update the OpenGL ES headers to the latest
2010-06-09 19:54:29 -07:00
Mathias Agopian
e81a3cb2bd
update EGL headers to the latest
...
note that this doesn't update the EGL stubs.
Change-Id: I00274431a490249d93eb6b5ba13f274b7f2682ae
2010-06-09 18:56:05 -07:00
Romain Guy
9a15900572
Merge "Move OpenGL support out of ViewRoot into a new HardwareRenderer class."
2010-06-09 18:27:31 -07:00
Mathias Agopian
11cca925b2
update GL ES stub libraries with the new GL ES headers
...
Change-Id: I83be94049ddfe3fd7f5bee71a21172ade1498dd5
2010-06-09 18:20:21 -07:00
Mathias Agopian
05bb9c973b
fix OpenGL ES extension headers from khronos
...
the official headers have a couple typos, which
this CL fixes.
Change-Id: I0359531a05a4a62ddbdce70c5841ec1c355feb3b
2010-06-09 18:19:11 -07:00
Mathias Agopian
8f62c3031e
update the OpenGL ES headers to the latest
...
Change-Id: Iceef1e95504897a5e3759b0401cf7031c9e74547
2010-06-09 18:08:15 -07:00
Robert Greenwalt
f1ab804ea7
Merge "Clean up APN notifications."
2010-06-09 17:11:05 -07:00
Jean-Baptiste Queru
93c90df092
am 030b0ebe: merge from froyo-plus-aosp
2010-06-09 16:12:11 -07:00
Jean-Baptiste Queru
1a62198e28
merge from froyo-plus-aosp
...
Change-Id: Iad8617b45d406e7f737bf68ed723755363d27e9b
2010-06-09 16:09:19 -07:00
Jason Sams
ad6b91320d
Merge "Remove float8/16 from RS type list. We will not have time to work through ABI issues for these types on arm for our ship date. Can be re-added later."
2010-06-09 15:54:35 -07:00
Nick Kralevich
3d45b00208
am 69b04a70: am 2feafeff: Merge "Fix a problem with leaking UDP sockets." into kraken
2010-06-09 15:26:41 -07:00
Joe Onorato
14e6c724a4
resolved conflicts for merge of f7b79151 to master
...
Change-Id: Ia4538f73d8bade9e6565835d484dcb650830feca
2010-06-09 15:07:16 -07:00