Andreas Huber
9812b9ce77
Merge "Restore feature parity with the old HTTPDataSource as far as support for extra headers (cookies?) and socket-timeout are concerned." into kraken
2010-06-11 10:52:00 -07:00
Andreas Huber
0ca952c7ab
am e577e87a: Fix a typo in NuCachedSource2 that would trigger an assert near the end of a stream.
...
Merge commit 'e577e87a2d80890190f14edc4a5caf70d7c566bf' into gingerbread-plus-aosp
* commit 'e577e87a2d80890190f14edc4a5caf70d7c566bf':
Fix a typo in NuCachedSource2 that would trigger an assert near the end of a stream.
2010-06-11 10:12:59 -07:00
Chih-Chung Chang
9f2fcfae26
am b8bb78f5: Change camera interface to support multiple cameras.
...
Merge commit 'b8bb78f54b48868465a9d69d65fda08524ab5ae1' into gingerbread-plus-aosp
* commit 'b8bb78f54b48868465a9d69d65fda08524ab5ae1':
Change camera interface to support multiple cameras.
2010-06-11 03:27:30 -07:00
Chih-Chung Chang
189aab1390
Change camera interface to support multiple cameras.
...
Change-Id: Ie88fe706d2278acf762eca87780de349434778a4
2010-06-11 16:47:33 +08:00
Wu-cheng Li
271fd4ff86
am 2fd73a45: Unhide camera metering mode API.
...
Merge commit '2fd73a452268d2acb6e72a1d23a422085ed3c510' into gingerbread-plus-aosp
* commit '2fd73a452268d2acb6e72a1d23a422085ed3c510':
Unhide camera metering mode API.
2010-06-11 00:33:37 -07:00
Irfan Sheriff
ec49dd6dab
am f4f614f5: am 9f2a0115: Merge "Remove indefinite DHCP retries" into froyo
2010-06-10 19:02:23 -07:00
Irfan Sheriff
8a9a65637a
am 9f2a0115: Merge "Remove indefinite DHCP retries" into froyo
...
Merge commit '9f2a0115220c8e288c32d8cf90e235a2f2be115b' into froyo-plus-aosp
* commit '9f2a0115220c8e288c32d8cf90e235a2f2be115b':
Remove indefinite DHCP retries
2010-06-10 19:02:13 -07:00
Irfan Sheriff
deaae079f4
am 9f2a0115: Merge "Remove indefinite DHCP retries" into froyo
...
Merge commit '9f2a0115220c8e288c32d8cf90e235a2f2be115b' into kraken
* commit '9f2a0115220c8e288c32d8cf90e235a2f2be115b':
Remove indefinite DHCP retries
2010-06-10 18:59:42 -07:00
Irfan Sheriff
c17564db5a
Merge "Remove indefinite DHCP retries" into froyo
2010-06-10 18:56:04 -07:00
Mathias Agopian
434216dbcf
am 9d8e8dcc: Merge "fix [2757903] Crash in EGL when creating an EGLSurface" into kraken
2010-06-10 17:15:12 -07:00
Mathias Agopian
5f86a2d33c
Merge "fix [2757903] Crash in EGL when creating an EGLSurface" into kraken
2010-06-10 17:12:42 -07:00
Mike Lockwood
555602e9ae
am 4001120e: am f4a502a2: Merge "Don\'t adjust lights if screen or button brightness is changed when the screen is off." into froyo
2010-06-10 15:32:51 -07:00
Mike Lockwood
dddfaba20c
am f4a502a2: Merge "Don\'t adjust lights if screen or button brightness is changed when the screen is off." into froyo
...
Merge commit 'f4a502a235e9f9ea0bcd2d5ca4981dc6e1a619c4' into kraken
* commit 'f4a502a235e9f9ea0bcd2d5ca4981dc6e1a619c4':
Don't adjust lights if screen or button brightness is changed when the screen is off.
2010-06-10 15:30:41 -07:00
Mike Lockwood
1550bc01c1
am f4a502a2: Merge "Don\'t adjust lights if screen or button brightness is changed when the screen is off." into froyo
...
Merge commit 'f4a502a235e9f9ea0bcd2d5ca4981dc6e1a619c4' into froyo-plus-aosp
* commit 'f4a502a235e9f9ea0bcd2d5ca4981dc6e1a619c4':
Don't adjust lights if screen or button brightness is changed when the screen is off.
2010-06-10 15:30:33 -07:00
Mike Lockwood
68c92f3410
Merge "Don't adjust lights if screen or button brightness is changed when the screen is off." into froyo
2010-06-10 15:28:31 -07:00
Andreas Huber
1d9f6d21f3
am 4d61f602: Switch stagefright\'s approach to prefetching to the new model. The java MediaPlayer is now notified about rebuffering start/end via info messages.
2010-06-10 15:19:29 -07:00
Andreas Huber
0b8689f36f
am a6ef19a8: Merge "Simplify the code in the stagefright commandline utility." into kraken
2010-06-10 15:17:40 -07:00
Andreas Huber
a1cd5a7730
am fbdb5f1b: Merge "Switch LiveSource to use the new http data source instead of the old one." into kraken
2010-06-10 15:17:35 -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
be6de699d2
Merge "Simplify the code in the stagefright commandline utility." into kraken
2010-06-10 15:15:50 -07:00
Andreas Huber
ade8fbc2df
Merge "Switch LiveSource to use the new http data source instead of the old one." into kraken
2010-06-10 15:15:43 -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
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
113d0fda7b
am 8f2ca788: Merge "Fix bug 2757693 - Multi-touch coordinates can jump when a finger goes down." into froyo
...
Merge commit '8f2ca788f369892370477212cf9e7a67721a8c16' into froyo-plus-aosp
* commit '8f2ca788f369892370477212cf9e7a67721a8c16':
Fix bug 2757693 - Multi-touch coordinates can jump when a finger goes down.
2010-06-10 14:14:44 -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
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
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
Nick Kralevich
168a7eca42
am a2c6d5bf: do not merge: cherry-picked 929b4855b8208d36272769e8eeaa6cd2823b94c0 from master branch
...
Merge commit 'a2c6d5bf308181c019ade0aac6d25fe33dc3d76c' into froyo-plus-aosp
* commit 'a2c6d5bf308181c019ade0aac6d25fe33dc3d76c':
do not merge: cherry-picked 929b4855b8208d36272769e8eeaa6cd2823b94c0 from master branch
2010-06-10 11:50:51 -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
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
b3eeac55a7
am 36921ad8: am b00854d4: Import revised translations
2010-06-09 22:33:47 -07:00
Kenny Root
aed039d604
am b00854d4: Import revised translations
...
Merge commit 'b00854d4c07ee8c810d1e32984543297bfa80a8e' into froyo-plus-aosp
* commit 'b00854d4c07ee8c810d1e32984543297bfa80a8e':
Import revised translations
2010-06-09 22:32:01 -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
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
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