OSDN Git Service
Daniel Sandler [Fri, 18 Jun 2010 02:16:28 +0000 (19:16 -0700)]
am
a2650db7: Merge "Fix SDK docs build." into gingerbread
Merge commit '
a2650db770e93a9424d6d6948fd31f943f6dac49' into gingerbread-plus-aosp
* commit '
a2650db770e93a9424d6d6948fd31f943f6dac49':
Fix SDK docs build.
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:47:28 +0000 (18:47 -0700)]
am
801700b1: am
57f4503e: Work on issue #
2778549: Idle FRF72 is awake 18 mins more than ERE27 in 13hr test
Merge commit '
801700b1a2b3b5d3cf4264b62d8a776996bda4ca' into gingerbread-plus-aosp
* commit '
801700b1a2b3b5d3cf4264b62d8a776996bda4ca':
Work on issue #
2778549: Idle FRF72 is awake 18 mins more than ERE27 in 13hr test
Scott Main [Fri, 18 Jun 2010 01:47:25 +0000 (18:47 -0700)]
am
7f0a1f62: am
5f11e95f: docs: small edits to catchup to edits made in html pushed live
Merge commit '
7f0a1f62c63a91eab3bd21c65fa978c1b14650be' into gingerbread-plus-aosp
* commit '
7f0a1f62c63a91eab3bd21c65fa978c1b14650be':
docs: small edits to catchup to edits made in html pushed live
James Dong [Fri, 18 Jun 2010 01:47:22 +0000 (18:47 -0700)]
am
2bc48186: 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 '
2bc481861ab374f87c12b7bb816ff75ac46147f1' into gingerbread-plus-aosp
* commit '
2bc481861ab374f87c12b7bb816ff75ac46147f1':
When filling the cache, we always time out waiting for a condition that won't occur.
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 [Thu, 17 Jun 2010 20:53:48 +0000 (13:53 -0700)]
am
e899caf8: Fixed api/current.xml after a bad merge.
Merge commit '
e899caf8cce1d1a20121f19a99899553ae2b327e' into gingerbread-plus-aosp
* commit '
e899caf8cce1d1a20121f19a99899553ae2b327e':
Fixed api/current.xml after a bad merge.
Jeff Brown [Thu, 17 Jun 2010 20:31:07 +0000 (13:31 -0700)]
am
5c225b16: Even more native input dispatch work in progress.
Merge commit '
5c225b1680e696ae8bbf505a1997d6f720672f74' into gingerbread-plus-aosp
* commit '
5c225b1680e696ae8bbf505a1997d6f720672f74':
Even more native input dispatch work in progress.
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:26:03 +0000 (13:26 -0700)]
am
3a0146cd: Merge "New API for "immersive" activity windows." into gingerbread
Merge commit '
3a0146cd29fae3c5bc29d8d535d67826284f8cc9' into gingerbread-plus-aosp
* commit '
3a0146cd29fae3c5bc29d8d535d67826284f8cc9':
New API for "immersive" activity windows.
Daniel Sandler [Thu, 17 Jun 2010 20:25:56 +0000 (13:25 -0700)]
am
cc86c933: Merge "New API for high-priority Notifications and full-screen alerts." into gingerbread
Merge commit '
cc86c933f69e4c1d55e0f4f49936d04fb60d6bcf' into gingerbread-plus-aosp
* commit '
cc86c933f69e4c1d55e0f4f49936d04fb60d6bcf':
New API for high-priority Notifications and full-screen alerts.
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:42:24 +0000 (12:42 -0700)]
am
f3c6c982: 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 norm
Merge commit '
f3c6c982f68e6ada3cded6923301d2f6236f3c17' into gingerbread-plus-aosp
* commit '
f3c6c982f68e6ada3cded6923301d2f6236f3c17':
TimedEventQueue is apparently important for glitch-free media playback, and so
Scott Main [Thu, 17 Jun 2010 19:42:21 +0000 (12:42 -0700)]
am
78e6622f: am
821ca518: docs: edits to resources doc
Merge commit '
78e6622fbb2bacdac68269b60cc694275ae132a4' into gingerbread-plus-aosp
* commit '
78e6622fbb2bacdac68269b60cc694275ae132a4':
docs: edits to resources doc
Scott Main [Thu, 17 Jun 2010 19:42:18 +0000 (12:42 -0700)]
am
d22bffdf: am
bccedb03: docs: update dashboard again
Merge commit '
d22bffdf6f2f899913c4dcf7fa75241f7c270059' into gingerbread-plus-aosp
* commit '
d22bffdf6f2f899913c4dcf7fa75241f7c270059':
docs: update dashboard again
Dan Morrill [Thu, 17 Jun 2010 19:42:14 +0000 (12:42 -0700)]
am
45378f07: 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 '
45378f07b8c0d79fe56fc75ad25738f8750e88c8' into gingerbread-plus-aosp
* commit '
45378f07b8c0d79fe56fc75ad25738f8750e88c8':
As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk files
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:49:17 +0000 (11:49 -0700)]
am
42a18c09: Check and clip some video encoding parameters against media profiles before passing them to video encoder
Merge commit '
42a18c09e7bb9c372382e88053409c25563ae7c9' into gingerbread-plus-aosp
* commit '
42a18c09e7bb9c372382e88053409c25563ae7c9':
Check and clip some video encoding parameters against media profiles before passing them to video encoder
James Dong [Thu, 17 Jun 2010 18:26:57 +0000 (11:26 -0700)]
am
cd677a30: Merge "Remove hard-coded number of audio channels in AudioSource" into gingerbread
Merge commit '
cd677a30851e4ba8b79a41c20e20220a81719378' into gingerbread-plus-aosp
* commit '
cd677a30851e4ba8b79a41c20e20220a81719378':
Remove hard-coded number of audio channels in AudioSource
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
Dianne Hackborn [Thu, 17 Jun 2010 01:49:28 +0000 (18:49 -0700)]
am
6b7b4845: Various improvements to battery stats collection
Merge commit '
6b7b4845212b3a439c527f2e1eca205b6b45fceb' into gingerbread-plus-aosp
* commit '
6b7b4845212b3a439c527f2e1eca205b6b45fceb':
Various improvements to battery stats collection
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:41:00 +0000 (14:41 -0700)]
am
c95812e6: Merge "Move out all framework-tests classes." into gingerbread
Merge commit '
c95812e6cacaa14748c81323bac6561453991a24' into gingerbread-plus-aosp
* commit '
c95812e6cacaa14748c81323bac6561453991a24':
Move out all framework-tests classes.
Brett Chabot [Wed, 16 Jun 2010 21:39:41 +0000 (14:39 -0700)]
Merge "Move out all framework-tests classes." into gingerbread
Irfan Sheriff [Wed, 16 Jun 2010 21:31:54 +0000 (14:31 -0700)]
am
f897b443: Fix driver stop check
Merge commit '
f897b443fed5c88c6b12e3fa1da72f231db67673' into gingerbread-plus-aosp
* commit '
f897b443fed5c88c6b12e3fa1da72f231db67673':
Fix driver stop check
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:45:00 +0000 (19:45 -0700)]
am
c980ba25: am
cdeae439: Merge "docs: update dashboard" into froyo
Merge commit '
c980ba25b0916d7c276c23e420195dd7959379a0' into gingerbread-plus-aosp
* commit '
c980ba25b0916d7c276c23e420195dd7959379a0':
docs: update dashboard
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:48:23 +0000 (16:48 -0700)]
am
92266a78: Merge "More work in progress on native events." into gingerbread
Merge commit '
92266a7894becc1cdf2298fd02380749ab036131' into gingerbread-plus-aosp
* commit '
92266a7894becc1cdf2298fd02380749ab036131':
More work in progress on native events.
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:36:41 +0000 (15:36 -0700)]
am
a6c52938: Merge "add new video/audio presence icons in the framework resource dirs, and make them public." into gingerbread
Merge commit '
a6c52938b144c2bbd8c1e22d24629b12e35c99a3' into gingerbread-plus-aosp
* commit '
a6c52938b144c2bbd8c1e22d24629b12e35c99a3':
add new video/audio presence icons in the framework resource dirs, and make them public.
Ying Wang [Tue, 15 Jun 2010 22:34:51 +0000 (15:34 -0700)]
am
3137f8c5: am
6567adf8: Move android-common to framework/ex
Merge commit '
3137f8c54d00d8eefe011a0256e2d85a036b207c' into gingerbread-plus-aosp
* commit '
3137f8c54d00d8eefe011a0256e2d85a036b207c':
Move android-common to framework/ex
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:23:59 +0000 (15:23 -0700)]
am
987e223d: am
27357fc0: Merge "Use the droidcore goal with dist-for-goals." into froyo
Merge commit '
987e223df73abe6cca47d09fff3a87be0243a085' into gingerbread-plus-aosp
* commit '
987e223df73abe6cca47d09fff3a87be0243a085':
Use the droidcore goal with dist-for-goals.
Joe Onorato [Tue, 15 Jun 2010 22:23:55 +0000 (15:23 -0700)]
am
9a5fcd1c: 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 '
9a5fcd1c14dcea951099433885ed3519dee90f48' into gingerbread-plus-aosp
* commit '
9a5fcd1c14dcea951099433885ed3519dee90f48':
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 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:50:43 +0000 (10:50 -0700)]
am
ac8b0d47: 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
Merge commit '
ac8b0d47011293ef713f4996317bbda579354200' into gingerbread-plus-aosp
* commit '
ac8b0d47011293ef713f4996317bbda579354200':
This patch enables each omx instance to have a separate message dispatcher, and
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:47:24 +0000 (10:47 -0700)]
am
0014296b: 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 '
0014296b1faca612134a1daa7f74dd82ed40cc2d' into gingerbread-plus-aosp
* commit '
0014296b1faca612134a1daa7f74dd82ed40cc2d':
docs: add information about known issues in resource matching
Scott Main [Tue, 15 Jun 2010 17:47:21 +0000 (10:47 -0700)]
am
e4bca7ee: am
322e7e47: Merge "docs: fix markup error" into froyo
Merge commit '
e4bca7ee60c6d361ef9f1f025881a6f80a9efdab' into gingerbread-plus-aosp
* commit '
e4bca7ee60c6d361ef9f1f025881a6f80a9efdab':
docs: fix markup error
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
Mathias Agopian [Tue, 15 Jun 2010 05:00:40 +0000 (22:00 -0700)]
am
2d468c5d: Make sure SurfaceView use a 565 surface when requesting an OPAQUE format.
Merge commit '
2d468c5d73cc1cefbcfa8d98e30622c54756918c' into gingerbread-plus-aosp
* commit '
2d468c5d73cc1cefbcfa8d98e30622c54756918c':
Make sure SurfaceView use a 565 surface when requesting an OPAQUE format.
Jeff Brown [Mon, 14 Jun 2010 23:32:28 +0000 (16:32 -0700)]
am
96e59eb8: Merge "Support for multiple tests" into gingerbread
Merge commit '
96e59eb8f34e999deb9eb4974cbfc07c71df3cab' into gingerbread-plus-aosp
* commit '
96e59eb8f34e999deb9eb4974cbfc07c71df3cab':
Support for multiple tests
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:21:21 +0000 (15:21 -0700)]
am
742b282e: Merge "StrictMode: implement the log-to-DropBox option" into gingerbread
Merge commit '
742b282e1168ed3820cb549a89753f39f4de0fa6' into gingerbread-plus-aosp
* commit '
742b282e1168ed3820cb549a89753f39f4de0fa6':
StrictMode: implement the log-to-DropBox option
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:13:07 +0000 (14:13 -0700)]
am
7e900cbf: Merge "Update build version information." into gingerbread
Merge commit '
7e900cbf1d600a8895e63a0247f45c116ff05172' into gingerbread-plus-aosp
* commit '
7e900cbf1d600a8895e63a0247f45c116ff05172':
Update build version information.
Dianne Hackborn [Mon, 14 Jun 2010 21:10:43 +0000 (14:10 -0700)]
Merge "Update build version information." into gingerbread
James Dong [Mon, 14 Jun 2010 20:20:54 +0000 (13:20 -0700)]
am
dca66e1c: Fixed a typo - maybe we should do comparison ignoring the case?
Merge commit '
dca66e1c3bc8842b0d44e0cb004e507a456e4b8f' into gingerbread-plus-aosp
* commit '
dca66e1c3bc8842b0d44e0cb004e507a456e4b8f':
Fixed a typo - maybe we should do comparison ignoring the case?
The Android Open Source Project [Mon, 14 Jun 2010 18:35:51 +0000 (11:35 -0700)]
merge from froyo-plus-aosp
Change-Id: I9cede57e10df9d6ba411b2960a77d7b9b60a1489
The Android Open Source Project [Mon, 14 Jun 2010 18:07:32 +0000 (11:07 -0700)]
merge from open-source master
Change-Id: Ica77cebdbb8880345faeb1ee819f51b0b7ff7a0c
The Android Open Source Project [Mon, 14 Jun 2010 18:06:33 +0000 (11:06 -0700)]
merge from open-source master
Change-Id: I7a9f23192372fc6973d9f3eb399f895f4765f6b2
The Android Open Source Project [Mon, 14 Jun 2010 18:02:30 +0000 (11:02 -0700)]
merge from open-source master
Change-Id: Ic1ad1c55b5f4560b51c6b422b6f086c95a6fd69e
The Android Open Source Project [Mon, 14 Jun 2010 17:57:53 +0000 (10:57 -0700)]
merge from open-source master
Change-Id: I5d19eb677dcfc7b73919d659fafb29fb85dc7f47
Jean-Baptiste Queru [Mon, 14 Jun 2010 17:28:23 +0000 (10:28 -0700)]
Merge "replaced deprecated getIntent with parseURI"
Brad Fitzpatrick [Mon, 14 Jun 2010 16:34:22 +0000 (09:34 -0700)]
am
60e8c33d: Merge "Dropbox: remove redundant Entry construction." into gingerbread
Merge commit '
60e8c33d6f6caad2e963e91abca16a85cd3be82a' into gingerbread-plus-aosp
* commit '
60e8c33d6f6caad2e963e91abca16a85cd3be82a':
Dropbox: remove redundant Entry construction.
Brad Fitzpatrick [Mon, 14 Jun 2010 16:32:26 +0000 (09:32 -0700)]
Merge "Dropbox: remove redundant Entry construction." into gingerbread
Jean-Baptiste Queru [Mon, 14 Jun 2010 16:27:14 +0000 (09:27 -0700)]
Merge "Added an addAll to the ArrayAdapter"
Eric Laurent [Mon, 14 Jun 2010 16:07:03 +0000 (09:07 -0700)]
am
e0219539: am
01f7ac64: Merge "Issue
2667802: [Audio Effect Framework] AudioEffect base class and JNI." into kraken
Merge commit '
e0219539c6c3e60de4a35cd836df3b68c963e9e0' into gingerbread-plus-aosp
* commit '
e0219539c6c3e60de4a35cd836df3b68c963e9e0':
Issue
2667802: [Audio Effect Framework] AudioEffect base class and JNI.
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
Jean-Baptiste Queru [Mon, 14 Jun 2010 15:56:49 +0000 (08:56 -0700)]
Merge "Should accept "application/vnd.wap.multipart.alternative" message."
Chih-Chung Chang [Mon, 14 Jun 2010 11:14:09 +0000 (04:14 -0700)]
am
f1cefa91: am
724c5224: Correct the setDisplayOrientation sample code.
Merge commit '
f1cefa916712dafc8b47f6eb8132a688892d4995' into gingerbread-plus-aosp
* commit '
f1cefa916712dafc8b47f6eb8132a688892d4995':
Correct the setDisplayOrientation sample code.
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:26:54 +0000 (20:26 -0700)]
am
28a6c8e9: am
d890cbf7: Remove PollLoop from host build.
Merge commit '
28a6c8e9b366ecfc3518e6b0fb1d1bc46cf823e8' into gingerbread-plus-aosp
* commit '
28a6c8e9b366ecfc3518e6b0fb1d1bc46cf823e8':
Remove PollLoop from host build.
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 03:01:47 +0000 (20:01 -0700)]
am
5e95930b: am
43a9527c: Fix include paths.
Merge commit '
5e95930bd87b98b01ffe48075fa13c234c2ed08f' into gingerbread-plus-aosp
* commit '
5e95930bd87b98b01ffe48075fa13c234c2ed08f':
Fix include paths.
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:59:04 +0000 (17:59 -0700)]
am
7c8aa44f: am
46b9ac0a: Native input dispatch rewrite work in progress.
Merge commit '
7c8aa44f320f45e8417f0aba9ca67af6a67a5cf7' into gingerbread-plus-aosp
* commit '
7c8aa44f320f45e8417f0aba9ca67af6a67a5cf7':
Native input dispatch rewrite work in progress.
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:28:57 +0000 (18:28 -0700)]
am
94f14aec: Merge "More StrictMode work, handling violations in ActivityManagerService." into gingerbread
Merge commit '
94f14aeca9e6c6d07b39a7f708eacadcfeb6fbd2' into gingerbread-plus-aosp
* commit '
94f14aeca9e6c6d07b39a7f708eacadcfeb6fbd2':
More StrictMode work, handling violations in ActivityManagerService.
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:58:34 +0000 (16:58 -0700)]
am
3a010fa6: am
1067e689: Merge "Doc change: remove pdf summary of guidelines from templates archive." into froyo
Merge commit '
3a010fa6192f09121fc920810c5a8366b5b09f46' into gingerbread-plus-aosp
* commit '
3a010fa6192f09121fc920810c5a8366b5b09f46':
Doc change: remove pdf summary of guidelines from templates archive.
Dirk Dougherty [Fri, 11 Jun 2010 23:57:45 +0000 (16:57 -0700)]
am
1067e689: Merge "Doc change: remove pdf summary of guidelines from templates archive." into froyo
Merge commit '
1067e6895e941f56edc7bc3d7c16a7122fb5259b' into froyo-plus-aosp
* commit '
1067e6895e941f56edc7bc3d7c16a7122fb5259b':
Doc change: remove pdf summary of guidelines from templates archive.
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:59:30 +0000 (15:59 -0700)]
am
126ca6f9: Merge "Must hold lock here..." into gingerbread
Merge commit '
126ca6f9ecab6f912ea9f4f00af35c410aae504b' into gingerbread-plus-aosp
* commit '
126ca6f9ecab6f912ea9f4f00af35c410aae504b':
Must hold lock here...
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:30:36 +0000 (15:30 -0700)]
am
c2bc66d4: Merge "Dont persist config on failure" into gingerbread
Merge commit '
c2bc66d40510be99e748697cb12c2609cc0e23fc' into gingerbread-plus-aosp
* commit '
c2bc66d40510be99e748697cb12c2609cc0e23fc':
Dont persist config on failure
Irfan Sheriff [Fri, 11 Jun 2010 22:28:24 +0000 (15:28 -0700)]
Merge "Dont persist config on failure" into gingerbread