The Android Automerger
8f6e4a2c97
Merge branch 'froyo' into froyo-release
2010-06-11 11:47:09 -07:00
Dianne Hackborn
9717ce1e9a
Merge "Adjust activity manager process OOM adj." into kraken
2010-06-11 10:53:16 -07:00
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
Chih-Chung Chang
189aab1390
Change camera interface to support multiple cameras.
...
Change-Id: Ie88fe706d2278acf762eca87780de349434778a4
2010-06-11 16:47:33 +08: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
Joe Onorato
977a647e81
Use the droidcore goal with dist-for-goals.
...
Change-Id: Ie0042028c4a33a23a4eb9aed1d1015e580c3e168
2010-06-10 18:36:58 -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
The Android Automerger
e575f4449a
Merge branch 'froyo' into froyo-release
2010-06-10 16:19:18 -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
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
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
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
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
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
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
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
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
Nick Kralevich
b4f689e6d5
Merge "Fix a problem with leaking UDP sockets." into kraken
2010-06-09 14:49:10 -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
3c2967b345
Merge "Fail gracefully if the user fails to supply necessary args to bmgr" into kraken
2010-06-09 12:25:05 -07:00
Mathias Agopian
74b3237fa9
Merge "allow re-targetting of surfaces" into kraken
2010-06-08 20:14:11 -07:00
Mathias Agopian
579b3f88d0
allow re-targetting of surfaces
...
Surfaces can now be parcelized and sent to remote
processes. When a surface crosses a process
boundary, it looses its connection with the
current process and gets attached to the new one.
Change-Id: I39c7b055bcd3ea1162ef2718d3d4b866bf7c81c0
2010-06-08 20:10:02 -07:00
The Android Automerger
9b45c6ce2c
Merge branch 'froyo' into froyo-release
2010-06-08 17:10:09 -07:00
Jim Miller
9cc61ca487
am 75b6a6b9: Merge "Fix 2737842: Disable KeguardManager API if device policy is enabled" into froyo
...
Merge commit '75b6a6b972e6b18143fd629d3d9c824c442c5f4c' into kraken
* commit '75b6a6b972e6b18143fd629d3d9c824c442c5f4c':
Fix 2737842: Disable KeguardManager API if device policy is enabled
2010-06-08 16:33:26 -07:00
Jim Miller
5ca447aa0c
Merge "Fix 2737842: Disable KeguardManager API if device policy is enabled" into froyo
2010-06-08 16:31:32 -07:00
Mathias Agopian
53503a97a9
fix [2751143] Device crashes when in a text box for too long
2010-06-08 15:40:56 -07:00
The Android Automerger
821de5fc86
Merge branch 'froyo' into froyo-release
2010-06-08 14:09:01 -07:00
James Dong
d13aa57bc4
Merge "Remove some hard-coded encoding parameters" into kraken
2010-06-08 13:13:26 -07:00
Romain Guy
c18bdc969a
am 71d73a0d: Merge "Add a method to hide/show a SurfaceView\'s surface." into froyo
...
Merge commit '71d73a0dfc110d0bdfc1b7ba385db3e2cfe007e5' into kraken
* commit '71d73a0dfc110d0bdfc1b7ba385db3e2cfe007e5':
Add a method to hide/show a SurfaceView's surface.
2010-06-08 13:00:30 -07:00
Romain Guy
649329c3da
Merge "Add a method to hide/show a SurfaceView's surface." into froyo
2010-06-08 12:59:36 -07:00
Brad Fitzpatrick
03540cdc9d
Merge "Log.wtf when databases go to be downgraded." into kraken
2010-06-08 12:37:34 -07:00
James Dong
0e90861ce2
Merge "Second part of speeding up video recording frame rate" into kraken
2010-06-08 10:14:26 -07:00
Andreas Huber
f0cf1d7ef8
Merge "Initial checkin of preliminary rtsp support for stagefright." into kraken
2010-06-08 09:19:07 -07:00
The Android Automerger
ee11ad1d54
Merge branch 'froyo' into froyo-release
2010-06-07 22:04:53 -07:00
Jim Miller
ca436aa5b4
am cb52cb52: Fix SDK build.
...
Merge commit 'cb52cb52253c3832ccc7f5f1dbb4d8a0bd8178c0' into kraken
* commit 'cb52cb52253c3832ccc7f5f1dbb4d8a0bd8178c0':
Fix SDK build.
2010-06-07 21:23:53 -07:00
Jim Miller
7d3eac2b0d
am bde25c20: Merge "Fix 2737842: disable keyguard API when device policy is enabled." into froyo
...
Merge commit 'bde25c207731783a62e3611586fe05cd35add0d9' into kraken
* commit 'bde25c207731783a62e3611586fe05cd35add0d9':
Fix 2737842: disable keyguard API when device policy is enabled.
2010-06-07 19:25:49 -07:00