OSDN Git Service
Kenny Root [Mon, 21 Jun 2010 16:02:13 +0000 (09:02 -0700)]
am
c4e38577: Import revised translations
Merge commit '
c4e38577f46a3b7953fffbb01b08eebc401fbc17' into gingerbread
* commit '
c4e38577f46a3b7953fffbb01b08eebc401fbc17':
Import revised translations
Chia-chi Yeh [Mon, 21 Jun 2010 15:54:19 +0000 (08:54 -0700)]
am
bd240c27: media: add AudioTrack::getMinFrameCount().
Merge commit '
bd240c2737913d6ed1982788699f93bbc52330c0' into gingerbread
* commit '
bd240c2737913d6ed1982788699f93bbc52330c0':
media: add AudioTrack::getMinFrameCount().
Daniel Sandler [Fri, 18 Jun 2010 02:14:44 +0000 (19:14 -0700)]
Merge "Fix SDK docs build." into gingerbread
Dianne Hackborn [Fri, 18 Jun 2010 01:43:31 +0000 (18:43 -0700)]
am
57f4503e: Work on issue #
2778549: Idle FRF72 is awake 18 mins more than ERE27 in 13hr test
Merge commit '
57f4503e1a129d6a648f2378d36a060998a577a0' into gingerbread
* commit '
57f4503e1a129d6a648f2378d36a060998a577a0':
Work on issue #
2778549: Idle FRF72 is awake 18 mins more than ERE27 in 13hr test
Scott Main [Fri, 18 Jun 2010 01:43:13 +0000 (18:43 -0700)]
am
5f11e95f: docs: small edits to catchup to edits made in html pushed live
Merge commit '
5f11e95f0041e163e8aa9e429aec92c8ee942233' into gingerbread
* commit '
5f11e95f0041e163e8aa9e429aec92c8ee942233':
docs: small edits to catchup to edits made in html pushed live
James Dong [Fri, 18 Jun 2010 01:43:10 +0000 (18:43 -0700)]
am
39e876ad: (-s ours) Merge "When filling the cache, we always time out waiting for a condition that won\'t occur. We are actually improving the power consumption for streaming applications like Pandora." into froyo
Merge commit '
39e876ad743f203fe005333947c61383772b0d14' into gingerbread
* commit '
39e876ad743f203fe005333947c61383772b0d14':
When filling the cache, we always time out waiting for a condition that won't occur.
Jeff Brown [Wed, 16 Jun 2010 08:53:36 +0000 (01:53 -0700)]
Even more native input dispatch work in progress.
Added more tests.
Fixed a regression in Vector.
Fixed bugs in pointer tracking.
Fixed a starvation issue in PollLoop when setting or removing callbacks.
Fixed a couple of policy nits.
Modified the internal representation of MotionEvent to be more
efficient and more consistent.
Added code to skip/cancel virtual key processing when there are multiple
pointers down. This helps to better disambiguate virtual key presses
from stray touches (such as cheek presses).
Change-Id: I2a7d2cce0195afb9125b23378baa94fd2fc6671c
Daniel Sandler [Thu, 17 Jun 2010 20:24:01 +0000 (13:24 -0700)]
Merge "New API for "immersive" activity windows." into gingerbread
Daniel Sandler [Thu, 17 Jun 2010 20:23:59 +0000 (13:23 -0700)]
Merge "New API for high-priority Notifications and full-screen alerts." into gingerbread
Dave Sparks [Thu, 17 Jun 2010 19:37:15 +0000 (12:37 -0700)]
am
3242cc27: Merge "TimedEventQueue is apparently important for glitch-free media playback, and so having it inherit its priority from the thread that created it is a bad idea. Instead, set the priority explicitly, and bump it to slightly higher than normal." into fro
Merge commit '
3242cc2719a4aeb64ac5ed273cf222d8d326d44b' into gingerbread
* commit '
3242cc2719a4aeb64ac5ed273cf222d8d326d44b':
TimedEventQueue is apparently important for glitch-free media playback, and so
Scott Main [Thu, 17 Jun 2010 19:37:06 +0000 (12:37 -0700)]
am
821ca518: docs: edits to resources doc
Merge commit '
821ca51857f4d21b231cd9ead786227b771fe759' into gingerbread
* commit '
821ca51857f4d21b231cd9ead786227b771fe759':
docs: edits to resources doc
Scott Main [Thu, 17 Jun 2010 19:36:31 +0000 (12:36 -0700)]
am
bccedb03: docs: update dashboard again
Merge commit '
bccedb03fad4e72c1776d2ab9e918fab4d25f222' into gingerbread
* commit '
bccedb03fad4e72c1776d2ab9e918fab4d25f222':
docs: update dashboard again
Dan Morrill [Thu, 17 Jun 2010 19:36:17 +0000 (12:36 -0700)]
am
6b22d81a: As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk files that have minSdkLevel (or targetSdkLevel) set to 4 or lower should not be presumed to require Bluetooth just because they take the permission.
Merge commit '
6b22d81aa35d9a9b32670995c002e92588b2fe09' into gingerbread
* commit '
6b22d81aa35d9a9b32670995c002e92588b2fe09':
As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk files
James Dong [Thu, 17 Jun 2010 18:25:19 +0000 (11:25 -0700)]
Merge "Remove hard-coded number of audio channels in AudioSource" into gingerbread
James Dong [Wed, 16 Jun 2010 23:10:52 +0000 (16:10 -0700)]
Merge "When filling the cache, we always time out waiting for a condition that won't occur. We are actually improving the power consumption for streaming applications like Pandora." into froyo
Brett Chabot [Wed, 16 Jun 2010 21:39:41 +0000 (14:39 -0700)]
Merge "Move out all framework-tests classes." into gingerbread
Dave Sparks [Wed, 16 Jun 2010 21:11:40 +0000 (14:11 -0700)]
Merge "TimedEventQueue is apparently important for glitch-free media playback, and so having it inherit its priority from the thread that created it is a bad idea. Instead, set the priority explicitly, and bump it to slightly higher than normal." into froyo
Scott Main [Wed, 16 Jun 2010 02:39:32 +0000 (19:39 -0700)]
am
cdeae439: Merge "docs: update dashboard" into froyo
Merge commit '
cdeae439a3637062dc0701654a1cb7874bfd1ae8' into gingerbread
* commit '
cdeae439a3637062dc0701654a1cb7874bfd1ae8':
docs: update dashboard
Scott Main [Wed, 16 Jun 2010 02:33:03 +0000 (19:33 -0700)]
Merge "docs: update dashboard" into froyo
Jeff Brown [Tue, 15 Jun 2010 23:44:23 +0000 (16:44 -0700)]
Merge "More work in progress on native events." into gingerbread
Jeff Brown [Tue, 15 Jun 2010 08:31:58 +0000 (01:31 -0700)]
More work in progress on native events.
Refactored the code to eliminate potential deadlocks due to re-entrant
calls from the policy into the dispatcher. Also added some plumbing
that will be used to notify the framework about ANRs.
Change-Id: Iba7a10de0cb3c56cd7520d6ce716db52fdcc94ff
Wei Huang [Tue, 15 Jun 2010 22:34:06 +0000 (15:34 -0700)]
Merge "add new video/audio presence icons in the framework resource dirs, and make them public." into gingerbread
Ying Wang [Tue, 15 Jun 2010 22:32:10 +0000 (15:32 -0700)]
am
6567adf8: Move android-common to framework/ex
Merge commit '
6567adf8b637c36817625cd38d64cd4b8510b097' into gingerbread
* commit '
6567adf8b637c36817625cd38d64cd4b8510b097':
Move android-common to framework/ex
Ying Wang [Tue, 15 Jun 2010 20:45:08 +0000 (13:45 -0700)]
Move android-common to framework/ex
This is one necessary step by unbundling.
Change-Id: I9d922a52374ad6331fa2e39fa4b5e16ad7d108fa
Joe Onorato [Tue, 15 Jun 2010 22:21:21 +0000 (15:21 -0700)]
am
27357fc0: Merge "Use the droidcore goal with dist-for-goals." into froyo
Merge commit '
27357fc08802d796a6b6a1111ac5534d75fc8be7' into gingerbread
* commit '
27357fc08802d796a6b6a1111ac5534d75fc8be7':
Use the droidcore goal with dist-for-goals.
Joe Onorato [Tue, 15 Jun 2010 22:21:14 +0000 (15:21 -0700)]
am
9d71860e: Merge "The aapt and aidl tools are prebuilt when we\'re doing an apps-only build, so don\'t try to build them." into froyo
Merge commit '
9d71860e8cbaf16ddae3cd5d06ede8e6cfc7675a' into gingerbread
* commit '
9d71860e8cbaf16ddae3cd5d06ede8e6cfc7675a':
The aapt and aidl tools are prebuilt when we're doing an apps-only build, so don't try to build them.
Joe Onorato [Tue, 15 Jun 2010 20:59:10 +0000 (13:59 -0700)]
Merge "Use the droidcore goal with dist-for-goals." into froyo
Joe Onorato [Tue, 15 Jun 2010 20:58:33 +0000 (13:58 -0700)]
Merge "The aapt and aidl tools are prebuilt when we're doing an apps-only build, so don't try to build them." into froyo
James Dong [Tue, 15 Jun 2010 17:48:58 +0000 (10:48 -0700)]
Merge "This patch enables each omx instance to have a separate message dispatcher, and thus eliminates the sharing of the message dispatches between omx instances." into gingerbread
Scott Main [Tue, 15 Jun 2010 17:43:10 +0000 (10:43 -0700)]
am
457738e6: Merge "docs: add information about known issues in resource matching for screen density and system version. Add section about providing compatibility for multiple devices" into froyo
Merge commit '
457738e628ee4d165014996bcf4e8d1983ac5929' into gingerbread
* commit '
457738e628ee4d165014996bcf4e8d1983ac5929':
docs: add information about known issues in resource matching
Scott Main [Tue, 15 Jun 2010 17:42:52 +0000 (10:42 -0700)]
am
322e7e47: Merge "docs: fix markup error" into froyo
Merge commit '
322e7e477d89aca18d65cbd289343e716c45a699' into gingerbread
* commit '
322e7e477d89aca18d65cbd289343e716c45a699':
docs: fix markup error
Scott Main [Tue, 15 Jun 2010 17:36:27 +0000 (10:36 -0700)]
Merge "docs: add information about known issues in resource matching for screen density and system version. Add section about providing compatibility for multiple devices" into froyo
Scott Main [Tue, 15 Jun 2010 17:36:14 +0000 (10:36 -0700)]
Merge "docs: fix markup error" into froyo
Jeff Brown [Mon, 14 Jun 2010 22:49:57 +0000 (15:49 -0700)]
Merge "Support for multiple tests" into gingerbread
Jeff Brown [Mon, 14 Jun 2010 22:44:41 +0000 (15:44 -0700)]
Support for multiple tests
The build system enforces some invariants that were being ignored
before.
Change-Id: Ie7675042af7f961a507386c13b2a0b592b591af8
Brad Fitzpatrick [Mon, 14 Jun 2010 22:19:51 +0000 (15:19 -0700)]
Merge "StrictMode: implement the log-to-DropBox option" into gingerbread
Dianne Hackborn [Mon, 14 Jun 2010 21:10:43 +0000 (14:10 -0700)]
Merge "Update build version information." into gingerbread
Brad Fitzpatrick [Mon, 14 Jun 2010 16:32:26 +0000 (09:32 -0700)]
Merge "Dropbox: remove redundant Entry construction." into gingerbread
Eric Laurent [Mon, 14 Jun 2010 16:04:33 +0000 (09:04 -0700)]
am
01f7ac64: Merge "Issue
2667802: [Audio Effect Framework] AudioEffect base class and JNI." into kraken
Merge commit '
01f7ac64488027492b2909b99d70491e7a391015' into gingerbread
* commit '
01f7ac64488027492b2909b99d70491e7a391015':
Issue
2667802: [Audio Effect Framework] AudioEffect base class and JNI.
Eric Laurent [Mon, 14 Jun 2010 16:02:13 +0000 (09:02 -0700)]
Merge "Issue
2667802: [Audio Effect Framework] AudioEffect base class and JNI." into kraken
Chih-Chung Chang [Mon, 14 Jun 2010 11:11:00 +0000 (04:11 -0700)]
am
724c5224: Correct the setDisplayOrientation sample code.
Merge commit '
724c52244423feced2677fbd1f905e0b8b0639f2' into gingerbread
* commit '
724c52244423feced2677fbd1f905e0b8b0639f2':
Correct the setDisplayOrientation sample code.
Jeff Brown [Mon, 14 Jun 2010 03:25:29 +0000 (20:25 -0700)]
am
d890cbf7: Remove PollLoop from host build.
Merge commit '
d890cbf700695c869e6b45cddf7f132484697588' into gingerbread
* commit '
d890cbf700695c869e6b45cddf7f132484697588':
Remove PollLoop from host build.
Jeff Brown [Mon, 14 Jun 2010 03:21:19 +0000 (20:21 -0700)]
Remove PollLoop from host build.
We can't build (and we don't need) PollLoop in the SDK on all platforms.
Change-Id: I3b0f327bbb8bc58b9b8630b0161cf360403fea68
Jeff Brown [Mon, 14 Jun 2010 02:59:26 +0000 (19:59 -0700)]
am
43a9527c: Fix include paths.
Merge commit '
43a9527c54b71cb17515591af37eeeef6c22e3ff' into gingerbread
* commit '
43a9527c54b71cb17515591af37eeeef6c22e3ff':
Fix include paths.
Jeff Brown [Mon, 14 Jun 2010 02:35:19 +0000 (19:35 -0700)]
Fix include paths.
Change-Id: Ifda45688f9f02710a74d5d7a7d902bacf1441e2e
Jeff Brown [Mon, 14 Jun 2010 00:55:28 +0000 (17:55 -0700)]
am
46b9ac0a: Native input dispatch rewrite work in progress.
Merge commit '
46b9ac0ae2162309774a7478cd9d4e578747bfc2' into gingerbread
* commit '
46b9ac0ae2162309774a7478cd9d4e578747bfc2':
Native input dispatch rewrite work in progress.
Jeff Brown [Fri, 23 Apr 2010 01:58:52 +0000 (18:58 -0700)]
Native input dispatch rewrite work in progress.
The old dispatch mechanism has been left in place and continues to
be used by default for now. To enable native input dispatch,
edit the ENABLE_NATIVE_DISPATCH constant in WindowManagerPolicy.
Includes part of the new input event NDK API. Some details TBD.
To wire up input dispatch, as the ViewRoot adds a window to the
window session it receives an InputChannel object as an output
argument. The InputChannel encapsulates the file descriptors for a
shared memory region and two pipe end-points. The ViewRoot then
provides the InputChannel to the InputQueue. Behind the
scenes, InputQueue simply attaches handlers to the native PollLoop object
that underlies the MessageQueue. This way MessageQueue doesn't need
to know anything about input dispatch per-se, it just exposes (in native
code) a PollLoop that other components can use to monitor file descriptor
state changes.
There can be zero or more targets for any given input event. Each
input target is specified by its input channel and some parameters
including flags, an X/Y coordinate offset, and the dispatch timeout.
An input target can request either synchronous dispatch (for foreground apps)
or asynchronous dispatch (fire-and-forget for wallpapers and "outside"
targets). Currently, finding the appropriate input targets for an event
requires a call back into the WindowManagerServer from native code.
In the future this will be refactored to avoid most of these callbacks
except as required to handle pending focus transitions.
End-to-end event dispatch mostly works!
To do: event injection, rate limiting, ANRs, testing, optimization, etc.
Change-Id: I8c36b2b9e0a2d27392040ecda0f51b636456de25
Brad Fitzpatrick [Sat, 12 Jun 2010 01:27:20 +0000 (18:27 -0700)]
Merge "More StrictMode work, handling violations in ActivityManagerService." into gingerbread
Dirk Dougherty [Fri, 11 Jun 2010 23:56:04 +0000 (16:56 -0700)]
am
1067e689: Merge "Doc change: remove pdf summary of guidelines from templates archive." into froyo
Merge commit '
1067e6895e941f56edc7bc3d7c16a7122fb5259b' into gingerbread
* commit '
1067e6895e941f56edc7bc3d7c16a7122fb5259b':
Doc change: remove pdf summary of guidelines from templates archive.
Dirk Dougherty [Fri, 11 Jun 2010 23:49:14 +0000 (16:49 -0700)]
Merge "Doc change: remove pdf summary of guidelines from templates archive." into froyo
Andreas Huber [Fri, 11 Jun 2010 22:58:19 +0000 (15:58 -0700)]
Merge "Must hold lock here..." into gingerbread
Irfan Sheriff [Fri, 11 Jun 2010 22:28:24 +0000 (15:28 -0700)]
Merge "Dont persist config on failure" into gingerbread
James Dong [Fri, 11 Jun 2010 21:28:55 +0000 (14:28 -0700)]
Merge "Initial checkin for pause and resume control" into kraken
Dianne Hackborn [Fri, 11 Jun 2010 17:53:16 +0000 (10:53 -0700)]
Merge "Adjust activity manager process OOM adj." into kraken
Andreas Huber [Fri, 11 Jun 2010 17:52:00 +0000 (10:52 -0700)]
Merge "Restore feature parity with the old HTTPDataSource as far as support for extra headers (cookies?) and socket-timeout are concerned." into kraken
Chih-Chung Chang [Thu, 10 Jun 2010 05:32:16 +0000 (13:32 +0800)]
Change camera interface to support multiple cameras.
Change-Id: Ie88fe706d2278acf762eca87780de349434778a4
Irfan Sheriff [Fri, 11 Jun 2010 01:59:42 +0000 (18:59 -0700)]
am
9f2a0115: Merge "Remove indefinite DHCP retries" into froyo
Merge commit '
9f2a0115220c8e288c32d8cf90e235a2f2be115b' into kraken
* commit '
9f2a0115220c8e288c32d8cf90e235a2f2be115b':
Remove indefinite DHCP retries
Irfan Sheriff [Fri, 11 Jun 2010 01:56:04 +0000 (18:56 -0700)]
Merge "Remove indefinite DHCP retries" into froyo
Joe Onorato [Thu, 10 Jun 2010 02:06:02 +0000 (19:06 -0700)]
Use the droidcore goal with dist-for-goals.
Change-Id: Ie0042028c4a33a23a4eb9aed1d1015e580c3e168
Mathias Agopian [Fri, 11 Jun 2010 00:12:42 +0000 (17:12 -0700)]
Merge "fix [
2757903] Crash in EGL when creating an EGLSurface" into kraken
Mike Lockwood [Thu, 10 Jun 2010 22:30:41 +0000 (15:30 -0700)]
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.
Mike Lockwood [Thu, 10 Jun 2010 22:28:31 +0000 (15:28 -0700)]
Merge "Don't adjust lights if screen or button brightness is changed when the screen is off." into froyo
Andreas Huber [Thu, 10 Jun 2010 22:15:50 +0000 (15:15 -0700)]
Merge "Simplify the code in the stagefright commandline utility." into kraken
Andreas Huber [Thu, 10 Jun 2010 22:15:43 +0000 (15:15 -0700)]
Merge "Switch LiveSource to use the new http data source instead of the old one." into kraken
Andreas Huber [Thu, 10 Jun 2010 22:15:37 +0000 (15:15 -0700)]
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
Andreas Huber [Thu, 10 Jun 2010 22:15:29 +0000 (15:15 -0700)]
Merge "Initial check-in of new caching/prefetching data source implementation." into kraken
Adam Powell [Thu, 10 Jun 2010 21:13:51 +0000 (14:13 -0700)]
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.
Adam Powell [Thu, 10 Jun 2010 21:09:50 +0000 (14:09 -0700)]
Merge "Fix bug
2757693 - Multi-touch coordinates can jump when a finger goes down." into froyo
Andreas Huber [Thu, 10 Jun 2010 19:41:05 +0000 (12:41 -0700)]
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
Andreas Huber [Thu, 10 Jun 2010 19:40:39 +0000 (12:40 -0700)]
Merge "Initial check in of a new http data source implementation." into kraken
Nick Kralevich [Thu, 10 Jun 2010 18:54:53 +0000 (11:54 -0700)]
Andreas Huber [Thu, 10 Jun 2010 18:14:26 +0000 (11:14 -0700)]
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
James Dong [Thu, 10 Jun 2010 17:14:38 +0000 (10:14 -0700)]
Merge "Remove the lock/unlock workaround from CameraService" into kraken
Andreas Huber [Thu, 10 Jun 2010 17:12:57 +0000 (10:12 -0700)]
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
Kenny Root [Thu, 10 Jun 2010 05:31:32 +0000 (22:31 -0700)]
am
b00854d4: Import revised translations
Merge commit '
b00854d4c07ee8c810d1e32984543297bfa80a8e' into kraken
* commit '
b00854d4c07ee8c810d1e32984543297bfa80a8e':
Import revised translations
James Dong [Wed, 9 Jun 2010 22:57:48 +0000 (15:57 -0700)]
Remove the lock/unlock workaround from CameraService
bug -
2677772
Change-Id: I7c996daad8b3bfc89e9fa2d655dc18c9a5c68f2f
Mathias Agopian [Thu, 10 Jun 2010 02:54:29 +0000 (19:54 -0700)]
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
Mathias Agopian [Thu, 10 Jun 2010 01:46:35 +0000 (18:46 -0700)]
update EGL headers to the latest
note that this doesn't update the EGL stubs.
Change-Id: I00274431a490249d93eb6b5ba13f274b7f2682ae
Mathias Agopian [Thu, 10 Jun 2010 01:20:21 +0000 (18:20 -0700)]
update GL ES stub libraries with the new GL ES headers
Change-Id: I83be94049ddfe3fd7f5bee71a21172ade1498dd5
Mathias Agopian [Thu, 10 Jun 2010 01:19:11 +0000 (18:19 -0700)]
fix OpenGL ES extension headers from khronos
the official headers have a couple typos, which
this CL fixes.
Change-Id: I0359531a05a4a62ddbdce70c5841ec1c355feb3b
Mathias Agopian [Thu, 10 Jun 2010 01:08:15 +0000 (18:08 -0700)]
update the OpenGL ES headers to the latest
Change-Id: Iceef1e95504897a5e3759b0401cf7031c9e74547
Nick Kralevich [Wed, 9 Jun 2010 21:49:10 +0000 (14:49 -0700)]
Merge "Fix a problem with leaking UDP sockets." into kraken
Joe Onorato [Wed, 9 Jun 2010 21:44:58 +0000 (14:44 -0700)]
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).
Joe Onorato [Wed, 9 Jun 2010 21:43:47 +0000 (14:43 -0700)]
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.
Christopher Tate [Wed, 9 Jun 2010 19:25:05 +0000 (12:25 -0700)]
Merge "Fail gracefully if the user fails to supply necessary args to bmgr" into kraken
Mathias Agopian [Wed, 9 Jun 2010 03:14:11 +0000 (20:14 -0700)]
Merge "allow re-targetting of surfaces" into kraken
Mathias Agopian [Wed, 9 Jun 2010 02:54:15 +0000 (19:54 -0700)]
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
Jim Miller [Tue, 8 Jun 2010 23:33:26 +0000 (16:33 -0700)]
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
Jim Miller [Tue, 8 Jun 2010 23:31:32 +0000 (16:31 -0700)]
Merge "Fix
2737842: Disable KeguardManager API if device policy is enabled" into froyo
Mathias Agopian [Tue, 8 Jun 2010 22:40:56 +0000 (15:40 -0700)]
fix [
2751143] Device crashes when in a text box for too long
James Dong [Tue, 8 Jun 2010 20:13:26 +0000 (13:13 -0700)]
Merge "Remove some hard-coded encoding parameters" into kraken
Romain Guy [Tue, 8 Jun 2010 20:00:30 +0000 (13:00 -0700)]
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.
Romain Guy [Tue, 8 Jun 2010 19:59:36 +0000 (12:59 -0700)]
Merge "Add a method to hide/show a SurfaceView's surface." into froyo
Brad Fitzpatrick [Tue, 8 Jun 2010 19:37:34 +0000 (12:37 -0700)]
Merge "Log.wtf when databases go to be downgraded." into kraken
James Dong [Tue, 8 Jun 2010 17:14:26 +0000 (10:14 -0700)]
Merge "Second part of speeding up video recording frame rate" into kraken
Andreas Huber [Tue, 8 Jun 2010 16:19:07 +0000 (09:19 -0700)]
Merge "Initial checkin of preliminary rtsp support for stagefright." into kraken
Jim Miller [Tue, 8 Jun 2010 04:23:53 +0000 (21:23 -0700)]
Jim Miller [Tue, 8 Jun 2010 02:25:49 +0000 (19:25 -0700)]
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.
Jim Miller [Tue, 8 Jun 2010 02:24:45 +0000 (19:24 -0700)]
Merge "Fix
2737842: disable keyguard API when device policy is enabled." into froyo
Christopher Tate [Tue, 8 Jun 2010 01:48:27 +0000 (18:48 -0700)]
am
ac24d23c: Merge "Don\'t bring up Launcher until after boot complete" into froyo
Merge commit '
ac24d23cd4a96f38b4e9cb0318a7c298794b9b6a' into kraken
* commit '
ac24d23cd4a96f38b4e9cb0318a7c298794b9b6a':
Don't bring up Launcher until after boot complete