Mathias Agopian
f0754de2b0
am 5b669581: am 9d8e8dcc: Merge "fix [2757903] Crash in EGL when creating an EGLSurface" into kraken
2010-06-10 17:17:19 -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
Dmitri Plotnikov
effc9c3ee0
Merge "Reimplement the PhoneNumberFormattingTextWatcher"
2010-06-10 16:52:53 -07:00
Romain Guy
9e40cb4ee4
Merge "Fix native crash when enabling hardware acceleration."
2010-06-10 16:19:51 -07:00
Mike Lockwood
561b4de1e7
am 799f0e50: 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 16:13:50 -07:00
Andreas Huber
73556c3fab
am 627a0019: 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 16:13:37 -07:00
Andreas Huber
5c7403fb1b
am 32d8b25f: am a6ef19a8: Merge "Simplify the code in the stagefright commandline utility." into kraken
2010-06-10 16:13:29 -07:00
Andreas Huber
4af2c2bd3e
am 566e64af: am fbdb5f1b: Merge "Switch LiveSource to use the new http data source instead of the old one." into kraken
2010-06-10 16:13:24 -07:00
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
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
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
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
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
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
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