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
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
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
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
Mathias Agopian
8f62c3031e
update the OpenGL ES headers to the latest
...
Change-Id: Iceef1e95504897a5e3759b0401cf7031c9e74547
2010-06-09 18:08:15 -07:00
Jean-Baptiste Queru
1a62198e28
merge from froyo-plus-aosp
...
Change-Id: Iad8617b45d406e7f737bf68ed723755363d27e9b
2010-06-09 16:09:19 -07:00
Nick Kralevich
db4b2ee4e6
am 2feafeff: Merge "Fix a problem with leaking UDP sockets." into kraken
2010-06-09 14:50:10 -07:00
Nick Kralevich
b4f689e6d5
Merge "Fix a problem with leaking UDP sockets." into kraken
2010-06-09 14:49:10 -07:00
Joe Onorato
75e51bd81f
am ae706c10: Merge changes Ia5884ef4,Ie495a41d,I3f7066c2,If5faf446,I6ae0740f,I57b2d296,Iea78a637 into kraken
2010-06-09 14:47:18 -07:00
Joe Onorato
ba4e23477d
am 302759c1: Merge changes I4a11f027,Ib2c4abf6,Id0c7ef9f,I839d7771 into kraken
2010-06-09 14:45:31 -07:00
Joe Onorato
ea22badf01
Merge changes Ia5884ef4,Ie495a41d,I3f7066c2,If5faf446,I6ae0740f,I57b2d296,Iea78a637 into kraken
...
* changes:
Add a test item the turns on a bunch of extra icons.
Move the status bar icon list, hopefully for the last time.
Call into the notification manager when the panel is revealed.
Move status_bar_latest_event and LatestItemView into SystemUI.apk.
Start the status bar service based on a configuration option, instead of trampolining through a braodcast receiver.
Require the STATUS_BAR_SERVICE permission for something to be the status bar.
Handle errors inflating notifications (and their icons).
2010-06-09 14:44:58 -07:00
Joe Onorato
c4b1220105
Merge changes I4a11f027,Ib2c4abf6,Id0c7ef9f,I839d7771 into kraken
...
* changes:
dead code removal
Cap the number of notifications that a given package can post.
Move the usb mass storage notification & activity into SystemUI.apk.
Add some disabled logging and another test case for reapplying the notification views.
2010-06-09 14:43:47 -07:00
Christopher Tate
e848d6eb0c
am d7f659e8: Merge "Fail gracefully if the user fails to supply necessary args to bmgr" into kraken
2010-06-09 12:26:38 -07:00
Christopher Tate
3c2967b345
Merge "Fail gracefully if the user fails to supply necessary args to bmgr" into kraken
2010-06-09 12:25:05 -07:00
The Android Open Source Project
5e1b2f531d
merge from open-source master
...
Change-Id: I4ddfc902e70c85ab8b11698fc08df7247e46d0a9
2010-06-09 12:17:03 -07:00
The Android Open Source Project
0887ab4d10
merge from open-source master
...
Change-Id: Iaf90d2aaa3cb3a435336c2ccd08b587d9fc3690b
2010-06-09 12:14:58 -07:00
James Dong
6a852f1343
am 457d5ae3: Fix a potential(observed sometimes) media server crash
2010-06-09 11:29:30 -07:00
Jean-Baptiste Queru
1e254923ea
Merge "Adding mimetypes to the mimetype map used in the web view"
2010-06-09 10:51:16 -07:00
The Android Open Source Project
ae68e08411
ignore from open-source master
...
Change-Id: I534482f2c6ef252d704809fb0ce2f38f9f3d0cef
2010-06-09 09:21:39 -07:00
Jean-Baptiste Queru
64ba44a221
Merge "Fix for deadlock between StatusBarService and NotificationManagerService"
2010-06-09 07:28:50 -07:00
The Android Open Source Project
1e94155433
merge from open-source master
...
Change-Id: I1fd774738c01a2cdffac0d455c63d574131e6fb8
2010-06-09 07:14:36 -07:00
Mathias Agopian
2b6dd6deac
am 55f8209d: Merge "allow re-targetting of surfaces" into kraken
2010-06-08 20:15:56 -07:00
Mathias Agopian
74b3237fa9
Merge "allow re-targetting of surfaces" into kraken
2010-06-08 20:14:11 -07:00