OSDN Git Service
Dianne Hackborn [Tue, 13 Oct 2009 19:10:32 +0000 (12:10 -0700)]
am
43ebb2d9: am
81aaf56f: am
2c6c5e6e: Fix issue #
2176944: Need API so browser, others can determine memory size of device
Merge commit '
43ebb2d91518cac40c43ceb098fcf11b92959d31'
* commit '
43ebb2d91518cac40c43ceb098fcf11b92959d31':
Dianne Hackborn [Tue, 13 Oct 2009 19:10:23 +0000 (12:10 -0700)]
Dianne Hackborn [Tue, 13 Oct 2009 19:10:13 +0000 (12:10 -0700)]
James Dong [Tue, 13 Oct 2009 19:10:02 +0000 (12:10 -0700)]
am
6195432b: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp
Merge commit '
6195432b6fde3cda4bc7e2406c8f2975795933a7'
* commit '
6195432b6fde3cda4bc7e2406c8f2975795933a7':
Fix for
2177367: Reduce duration of vibrate in RotaryLockScreen
Fix issue #
2176944: Need API so browser, others can determine memory size of device
Fix issue #
2177262: Improve animations
Fix issue #
2174566: HOT STABILITY: NPE in activity manager
Dianne Hackborn [Tue, 13 Oct 2009 19:06:59 +0000 (12:06 -0700)]
Nick Pelly [Tue, 13 Oct 2009 19:06:50 +0000 (12:06 -0700)]
Nick Pelly [Tue, 13 Oct 2009 19:06:31 +0000 (12:06 -0700)]
Mathias Agopian [Tue, 13 Oct 2009 19:06:21 +0000 (12:06 -0700)]
Eric Fischer [Tue, 13 Oct 2009 19:06:11 +0000 (12:06 -0700)]
am
084e062a: (-s ours) am
9dd00e7a: am
aaa6299b: (-s ours) am
24c8645a: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
084e062a90806080beb892588bb6aca68e5c0cc1'
* commit '
084e062a90806080beb892588bb6aca68e5c0cc1':
Jean-Baptiste Queru [Tue, 13 Oct 2009 19:05:59 +0000 (12:05 -0700)]
am
d0a513d1: (-s ours) am
6fc4b1f1: am
ea110274: (-s ours) am
ac62c84a: (-s ours) DO NOT MERGE merge from donut-gms
Merge commit '
d0a513d17cc4132159591895e969da78a6c4e99a'
* commit '
d0a513d17cc4132159591895e969da78a6c4e99a':
Mike Lockwood [Tue, 13 Oct 2009 19:05:50 +0000 (12:05 -0700)]
Eric Laurent [Tue, 13 Oct 2009 19:05:40 +0000 (12:05 -0700)]
Jaikumar Ganesh [Tue, 13 Oct 2009 19:05:29 +0000 (12:05 -0700)]
John Wang [Tue, 13 Oct 2009 19:05:18 +0000 (12:05 -0700)]
Romain Guy [Tue, 13 Oct 2009 19:05:09 +0000 (12:05 -0700)]
Daisuke Miyakawa [Tue, 13 Oct 2009 19:04:58 +0000 (12:04 -0700)]
Eric Fischer [Tue, 13 Oct 2009 19:04:49 +0000 (12:04 -0700)]
am
94f3a363: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp
Merge commit '
94f3a36326ddecaa09787d795451b0a229fe111c'
* commit '
94f3a36326ddecaa09787d795451b0a229fe111c':
Remove STOPSHIP BT logging.
BT API security audit: fix a couple of permission mistakes.
Fix issue #
2175693: Add vmallocinfo to dumpstate
add a way to easily catch and log GL errors (compile time flag)
GPS: Fix problem with SUPL when SUPL APN is already active.
Import revised translations. DO NOT MERGE
Fix issue
2174002: After rejecting Call when device ringtone is mute and playing music, audio is not transfered to BT device.
Import revised translations. DO NOT MERGE
Andreas Huber [Tue, 13 Oct 2009 18:59:00 +0000 (11:59 -0700)]
am
1c83540e: am
2d295a96: Merge change Iedebfe8d into eclair-mr2
Merge commit '
1c83540e3829dc9664728f1f017686f16f61a4ea'
* commit '
1c83540e3829dc9664728f1f017686f16f61a4ea':
Some decoders will return an error on OMX_EmptyThisBuffer to indicate that they don't support the media format, deal with this.
Robert Greenwalt [Tue, 13 Oct 2009 18:58:50 +0000 (11:58 -0700)]
am
6036288a: am
c33623a0: Merge change Iba087ecc into eclair-mr2
Merge commit '
6036288ad953e56433a9936fad09213b328cad71'
* commit '
6036288ad953e56433a9936fad09213b328cad71':
Make FWK start a wifi scan if supplicant forgets.
Andreas Huber [Tue, 13 Oct 2009 18:58:40 +0000 (11:58 -0700)]
am
39c923a9: am
23bccd6c: Merge change I729c3938 into eclair-mr2
Merge commit '
39c923a94c377a75e34153f6dddb83fc9883d2a7'
* commit '
39c923a94c377a75e34153f6dddb83fc9883d2a7':
Insert a small delay after submitting to surface flinger and before returning the buffer to the decoder.
Brett Chabot [Tue, 13 Oct 2009 18:58:31 +0000 (11:58 -0700)]
am
0221ec55: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp
Merge commit '
0221ec55ac57f32a42fb1e7b66779ca955d58558'
* commit '
0221ec55ac57f32a42fb1e7b66779ca955d58558':
Control H icon display in Status bar.
Fixes #
2175599. Prevents an NPE when AttachInfo is null.
Set the Bond State to NONE when we receive a Agent Cancel.
Make vCard import Photo from vCard file :(
Tadashi G. Takaoka [Tue, 13 Oct 2009 18:58:00 +0000 (11:58 -0700)]
am
7c270311: am
50b11ec6: Merge change I4d828c3a into eclair-mr2
Merge commit '
7c270311f7167080112494c3095c984b1a141074'
* commit '
7c270311f7167080112494c3095c984b1a141074':
QuickContactBadge: Make lookup key query asynchronous.
Joshua Bartel [Tue, 13 Oct 2009 18:56:29 +0000 (11:56 -0700)]
Daisuke Miyakawa [Tue, 13 Oct 2009 18:56:18 +0000 (11:56 -0700)]
am
5f836334: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp
Merge commit '
5f836334e3af9c0cdfcde1f3b6a51c46a6a12412'
* commit '
5f836334e3af9c0cdfcde1f3b6a51c46a6a12412':
LocationManagerService: Fix race when removing LocationListener
Andreas Huber [Tue, 13 Oct 2009 18:54:43 +0000 (11:54 -0700)]
am
a6b76c35: am
cd74c0d5: The vendor is about to check in a fix for this issue, the workaround is no longer needed
Merge commit '
a6b76c35a482bd7f2cbab186aca9ea6e74a375d0'
* commit '
a6b76c35a482bd7f2cbab186aca9ea6e74a375d0':
The vendor is about to check in a fix for this issue, the workaround is no longer needed
San Mehat [Tue, 13 Oct 2009 18:54:25 +0000 (11:54 -0700)]
Bryan Mawhinney [Tue, 13 Oct 2009 18:54:14 +0000 (11:54 -0700)]
Marc Blank [Tue, 13 Oct 2009 18:54:04 +0000 (11:54 -0700)]
am
3c5600ec: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp
Merge commit '
3c5600ecccd38d8fb6d39330f31fe91b5f99481b'
* commit '
3c5600ecccd38d8fb6d39330f31fe91b5f99481b':
dumpstate: 'RAMCONSOLE' -> 'LAST KMSG'
Only dismiss search dialog after launching intent.
Fred Quintana [Tue, 13 Oct 2009 18:52:54 +0000 (11:52 -0700)]
Xia Wang [Tue, 13 Oct 2009 18:52:42 +0000 (11:52 -0700)]
am
ec61707d: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp
Merge commit '
ec61707d39c14950f53795b0610ea1ee00daecdb'
* commit '
ec61707d39c14950f53795b0610ea1ee00daecdb':
fix an NPE on a race condition that occurs when unbinding from an authenticator at the samer time that its process dies: bug
2171204
Dianne Hackborn [Tue, 13 Oct 2009 18:52:07 +0000 (11:52 -0700)]
Dianne Hackborn [Tue, 13 Oct 2009 18:51:58 +0000 (11:51 -0700)]
am
c7ed01f4: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp
Merge commit '
c7ed01f4011e688af59f91b613e48203690c394d'
* commit '
c7ed01f4011e688af59f91b613e48203690c394d':
More fix #
2163209: alarm clock rings but is hidden behind lock screen
Dave Sparks [Tue, 13 Oct 2009 18:51:11 +0000 (11:51 -0700)]
Jason Sams [Tue, 13 Oct 2009 18:51:00 +0000 (11:51 -0700)]
Doug Zongker [Tue, 13 Oct 2009 18:50:51 +0000 (11:50 -0700)]
am
40f888bf: am
83b60080: am
9af53ea6: am
3161795b: when logging free space on /data, log /system and /cache as well
Merge commit '
40f888bf6116118f257770eb517110413f9c672c'
* commit '
40f888bf6116118f257770eb517110413f9c672c':
Mathias Agopian [Tue, 13 Oct 2009 18:50:39 +0000 (11:50 -0700)]
Mathias Agopian [Tue, 13 Oct 2009 18:50:30 +0000 (11:50 -0700)]
Grace Kloba [Tue, 13 Oct 2009 18:50:20 +0000 (11:50 -0700)]
am
9136c39d: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp
Merge commit '
9136c39d4933bcf60bff0f76bc377d1985736ea5'
* commit '
9136c39d4933bcf60bff0f76bc377d1985736ea5':
Retry overlay create if it fails. Bug
2153980.
Add script to script call support. Add exception to catch out of bound index data when added to TriangleMeshBuilder.
fix [
2170283] SurfaceFlinger crashes on OOM.
fix [
2164183] sometimes device just wants to stay asleep
when logging free space on /data, log /system and /cache as well
Android (Google) Code Review [Tue, 13 Oct 2009 02:22:17 +0000 (22:22 -0400)]
Merge change Id70213e7
* changes:
Implement GL11 and GL11Ext methods for GL Log and Error wrappers.
Jack Palevich [Tue, 13 Oct 2009 02:20:49 +0000 (19:20 -0700)]
Implement GL11 and GL11Ext methods for GL Log and Error wrappers.
Until now we had been throwing UnsupportedOperationException when
developers tried to use the GL11 or GL11Ext methods. Now we handle
these methods correctly, passing their arguments through to the
wrapped interface's methods.
Fixes bug
2167522 GLUtils debug wrapper doesn't support GL11 features
Grace Kloba [Mon, 12 Oct 2009 19:42:01 +0000 (12:42 -0700)]
am
6764f2ca: am
a921bf4e: Merge change I8f5e405f into eclair-mr2
Merge commit '
6764f2ca442cbe906901af5296048f284adb1f7c'
* commit '
6764f2ca442cbe906901af5296048f284adb1f7c':
mGeolocationDatabasePath needs to compare mGeolocationDatabasePath
Dianne Hackborn [Mon, 12 Oct 2009 19:41:51 +0000 (12:41 -0700)]
Dianne Hackborn [Mon, 12 Oct 2009 19:41:42 +0000 (12:41 -0700)]
am
fb256574: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp
Merge commit '
fb256574b4b5b5237ddda0efcf876b8eb436c961'
* commit '
fb256574b4b5b5237ddda0efcf876b8eb436c961':
Fix issue #
2171460: Turn off background blurring of power dialog
Mathias Agopian [Mon, 12 Oct 2009 19:40:59 +0000 (12:40 -0700)]
Mike Cleron [Mon, 12 Oct 2009 19:40:47 +0000 (12:40 -0700)]
am
f9b8d3e1: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp
Merge commit '
f9b8d3e1038032bd5eb1c36123c9066a3792fd9c'
* commit '
f9b8d3e1038032bd5eb1c36123c9066a3792fd9c':
fix [
2170319] gmail bulk operation checkbox latency on passion
Dmitri Plotnikov [Mon, 12 Oct 2009 19:40:07 +0000 (12:40 -0700)]
Evan Millar [Mon, 12 Oct 2009 19:39:58 +0000 (12:39 -0700)]
am
1fe17c5f: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp
Merge commit '
1fe17c5f2f6dd288e60f6ce7d04f491a23f53e82'
* commit '
1fe17c5f2f6dd288e60f6ce7d04f491a23f53e82':
[Issue
2165234] Removing nickname clusters: John/Jack and Patrick/Rick.
Nick Pelly [Mon, 12 Oct 2009 19:39:02 +0000 (12:39 -0700)]
Nick Pelly [Mon, 12 Oct 2009 19:38:48 +0000 (12:38 -0700)]
am
b2ad0f18: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp
Merge commit '
b2ad0f18bc030535687aed67f5c3a3139045dd84'
* commit '
b2ad0f18bc030535687aed67f5c3a3139045dd84':
Introduce BluetoothAdapter.getDefaultAdapter().
Nick Pelly [Mon, 12 Oct 2009 19:36:15 +0000 (12:36 -0700)]
David 'Digit' Turner [Mon, 12 Oct 2009 19:36:03 +0000 (12:36 -0700)]
am
4c220bd0: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp
Merge commit '
4c220bd0f32b93314c4c1bff328bd815265ef117'
* commit '
4c220bd0f32b93314c4c1bff328bd815265ef117':
Encourage developers to connect RFCOMM by UUID instead of Channel.
Romain Guy [Mon, 12 Oct 2009 19:35:16 +0000 (12:35 -0700)]
am
3504ec10: am
1f42439a: am
35b38cef: Improve drawing cache speed by selecting the correct opacity and keeping a 32 bits format when the window is 32 bits.
Merge commit '
3504ec10833f7aad7b2f2ea253de8bebaf811455'
* commit '
3504ec10833f7aad7b2f2ea253de8bebaf811455':
Romain Guy [Mon, 12 Oct 2009 19:35:06 +0000 (12:35 -0700)]
am
ff9c48b3: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp
Merge commit '
ff9c48b3040833c7b3f85bcac116ba5f0dd247d0'
* commit '
ff9c48b3040833c7b3f85bcac116ba5f0dd247d0':
Improve drawing cache speed by selecting the correct opacity and keeping a 32 bits
Andreas Huber [Mon, 12 Oct 2009 19:34:08 +0000 (12:34 -0700)]
am
1e988a04: am
f894d111: Merge change I6c32aa75 into eclair-mr2
Merge commit '
1e988a04b55fcaab6116b8d565b68b4f62d01633'
* commit '
1e988a04b55fcaab6116b8d565b68b4f62d01633':
Workaround for avc decoder misreporting output buffer size requirements if the content is not a multiple-16 width/height.
Mike Reed [Mon, 12 Oct 2009 19:33:56 +0000 (12:33 -0700)]
Jeff Hamilton [Mon, 12 Oct 2009 19:33:44 +0000 (12:33 -0700)]
am
254d7ecd: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp
Merge commit '
254d7ecd06aabc54fb1d2b9afd53b6e78045c6a9'
* commit '
254d7ecd06aabc54fb1d2b9afd53b6e78045c6a9':
add (hidden) setHasAlpha() to allow clients like the view's cache to hint that a bitmap is opaque.
Amith Yamasani [Mon, 12 Oct 2009 19:32:39 +0000 (12:32 -0700)]
am
360fde8e: am
446aeb1c: Merge change Ia98129b9 into eclair-mr2
Merge commit '
360fde8eabdc9c45d1b52e350ccfb4bac9d93107'
* commit '
360fde8eabdc9c45d1b52e350ccfb4bac9d93107':
Fix preference caching to increase recycling of preference views.
Elliott Hughes [Mon, 12 Oct 2009 19:32:28 +0000 (12:32 -0700)]
am
4f0c414c: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp
Merge commit '
4f0c414c091daa54ac7997b7438995279506f791'
* commit '
4f0c414c091daa54ac7997b7438995279506f791':
Eric Fischer [Mon, 12 Oct 2009 19:32:07 +0000 (12:32 -0700)]
am
6a230c10: (-s ours) am
6756e440: am
e4b6639d: (-s ours) Merge change I9db1edea into eclair
Merge commit '
6a230c105a9d74c813b106689539b82fbda7d9b4'
* commit '
6a230c105a9d74c813b106689539b82fbda7d9b4':
Import revised translations. DO NOT MERGE
Dianne Hackborn [Mon, 12 Oct 2009 19:31:56 +0000 (12:31 -0700)]
am
c4f52bd7: am
7e5c5d97: am
0c3154d3: Fix issue #
2163654: deadlock, runtime restart
Merge commit '
c4f52bd7550f57b1d483091a71871653d8928901'
* commit '
c4f52bd7550f57b1d483091a71871653d8928901':
Fix issue #
2163654: deadlock, runtime restart
Robert Greenwalt [Mon, 12 Oct 2009 19:31:46 +0000 (12:31 -0700)]
am
91f36086: am
c24c0e9b: Merge change Ib8f16340 into eclair-mr2
Merge commit '
91f360869e3cf845043ccef31f9a6ab8f57b2896'
* commit '
91f360869e3cf845043ccef31f9a6ab8f57b2896':
Fix ConnectivityManager permissions check.
Cary Clark [Mon, 12 Oct 2009 19:29:36 +0000 (12:29 -0700)]
am
fface18d: am
5da9aeb4: reset webTextView size if focus bounds changes
Merge commit '
fface18d254900cff57623c364f47d929b4089f6'
* commit '
fface18d254900cff57623c364f47d929b4089f6':
reset webTextView size if focus bounds changes
Bjorn Bringert [Mon, 12 Oct 2009 19:28:50 +0000 (12:28 -0700)]
am
ef8e6b56: am
19400067: am
4625758d: Merge change I2c5f1e76 into eclair
Merge commit '
ef8e6b5672c91baab09d5699b5a3ca0cb33ced6b'
* commit '
ef8e6b5672c91baab09d5699b5a3ca0cb33ced6b':
Fix back button handling in ACTV
Fred Quintana [Mon, 12 Oct 2009 19:28:37 +0000 (12:28 -0700)]
am
7fc5e5ab: am
f9f7718f: am
f038004f: changes from Sync Manager API Review: bug
2164262
Merge commit '
7fc5e5ab6d404d13136d30b724975798717f57f0'
* commit '
7fc5e5ab6d404d13136d30b724975798717f57f0':
changes from Sync Manager API Review: bug
2164262
Mathias Agopian [Mon, 12 Oct 2009 19:28:02 +0000 (12:28 -0700)]
am
e52d5ffb: am
2504fba7: am
460b60c9: Revert "temporarily disable the use of glTexImage2D for sw buffers on sholes."
Merge commit '
e52d5ffb43f6cd6c2e37c4e636e39162464cfcf5'
* commit '
e52d5ffb43f6cd6c2e37c4e636e39162464cfcf5':
Revert "temporarily disable the use of glTexImage2D for sw buffers on sholes."
Brett Chabot [Mon, 12 Oct 2009 19:27:08 +0000 (12:27 -0700)]
am
d7dc2c47: am
baa44f11: am
773fd131: Merge change I3429f77a into eclair
Merge commit '
d7dc2c47745947b56ea33e36f69c3d8926524549'
* commit '
d7dc2c47745947b56ea33e36f69c3d8926524549':
Suppress flaky test HeapTest#testOomeLarge.
Mathias Agopian [Mon, 12 Oct 2009 19:26:55 +0000 (12:26 -0700)]
Eric Laurent [Mon, 12 Oct 2009 19:26:44 +0000 (12:26 -0700)]
am
82162049: am
4e362817: am
62443f5f: Fix issue
2139634: DTMF tones on Sholes popping, hissing (audio latency too high).
Merge commit '
821620494f0f073a27124e96139d5320df79d7e4'
* commit '
821620494f0f073a27124e96139d5320df79d7e4':
Fix issue
2139634: DTMF tones on Sholes popping, hissing (audio latency too high).
Romain Guy [Mon, 12 Oct 2009 19:26:34 +0000 (12:26 -0700)]
am
dba99815: am
72da3a46: am
c404ed2b: Fix failing unit test; the test was using a deprecated API making it fail on WVGA devices.
Merge commit '
dba9981588503dbfc442216a857ff001f46fff60'
* commit '
dba9981588503dbfc442216a857ff001f46fff60':
Fix failing unit test; the test was using a deprecated API making it fail on WVGA devices.
Mathias Agopian [Mon, 12 Oct 2009 19:26:24 +0000 (12:26 -0700)]
am
84a379cc: am
160e97cb: am
c131c567: temporarily disable the use of glTexImage2D for sw buffers on sholes.
Merge commit '
84a379cc0615b2c1682d99ed286c6d3cb2e114fe'
* commit '
84a379cc0615b2c1682d99ed286c6d3cb2e114fe':
temporarily disable the use of glTexImage2D for sw buffers on sholes.
android-build SharedAccount [Mon, 12 Oct 2009 19:23:37 +0000 (12:23 -0700)]
merged
d7c18d7672f3ecbbcb2f5bec92fe54dd990cb8dd, w/conflict in opengl/tests/copybits/Android.mk
Jason Sams [Mon, 12 Oct 2009 18:49:48 +0000 (11:49 -0700)]
am
2e9ca540: am
12bb2c4c: am
fe7c2a50: Merge change I996db8da into eclair
Merge commit '
2e9ca540fc15da4363111860949136e61b816dac'
* commit '
2e9ca540fc15da4363111860949136e61b816dac':
Fix tls crash on startup if more than one RS contexts are created in one process.
Josh Guilfoyle [Mon, 12 Oct 2009 18:48:50 +0000 (11:48 -0700)]
am
35a82b6b: am
1b7ad876: Merge change I6b51a98a into eclair-mr2
Merge commit '
35a82b6b5be55287589028e1f8874b65f50245f4'
* commit '
35a82b6b5be55287589028e1f8874b65f50245f4':
Fixed issue #4098: Ringtone#getTitle does not close its cursor.
Ray Chen [Mon, 12 Oct 2009 18:48:10 +0000 (11:48 -0700)]
am
2f2634e5: am
13ed5750: Add group id to getThumbnail and cancelThumbnailRequest API.
Merge commit '
2f2634e5be65c56f93d3fc3a97e25c546e3bc8bc'
* commit '
2f2634e5be65c56f93d3fc3a97e25c546e3bc8bc':
Add group id to getThumbnail and cancelThumbnailRequest API.
gwang@google.com [Mon, 12 Oct 2009 18:47:25 +0000 (11:47 -0700)]
am
ed2247dc: am
3e655688: am
521f4f3a: Merge change I3d6cf8aa into eclair
Merge commit '
ed2247dc685233b82c7769a5e17f103c1c603ab9'
* commit '
ed2247dc685233b82c7769a5e17f103c1c603ab9':
Fix for bug
2158794. Hide MediaPlayer.invoke() and MediaPlayer.newRequest(), and Fix bad links in ToneGenerator documentation.
Xavier Ducrohet [Mon, 12 Oct 2009 18:47:14 +0000 (11:47 -0700)]
Xavier Ducrohet [Mon, 12 Oct 2009 18:47:04 +0000 (11:47 -0700)]
am
66ce0f07: am
c7bade2a: am
0a9d46b7: Add a test to make sure the replaced classes in layoutlib are correct.
Merge commit '
66ce0f07fcb79b97dc52aa0a1c5fce1565f4f090'
* commit '
66ce0f07fcb79b97dc52aa0a1c5fce1565f4f090':
Add a test to make sure the replaced classes in layoutlib are correct.
Robert Greenwalt [Mon, 12 Oct 2009 18:46:54 +0000 (11:46 -0700)]
am
2a9b411d: am
e8830120: am
92b5caa4: Merge change Id8df149c into eclair
Merge commit '
2a9b411d4ed60acbe089068c93850ecd049f57f2'
* commit '
2a9b411d4ed60acbe089068c93850ecd049f57f2':
Turn some logging back on in ConnectionManager
Jim Miller [Mon, 12 Oct 2009 18:44:59 +0000 (11:44 -0700)]
am
e15dc6e1: am
ca4efac9: am
f65161f1: Merge change If933b13d into eclair
Merge commit '
e15dc6e19f944889a8d9f3fb97b014aa7d298de9'
* commit '
e15dc6e19f944889a8d9f3fb97b014aa7d298de9':
Fix for
2161835: Tweaks to rotary lock screen:
Jason Sams [Mon, 12 Oct 2009 18:44:49 +0000 (11:44 -0700)]
am
c5f2aae4: am
9816a5d1: am
968a9571: Merge change I516c3191 into eclair
Merge commit '
c5f2aae4da0a0aef635453bbd86b570e46b66bb2'
* commit '
c5f2aae4da0a0aef635453bbd86b570e46b66bb2':
Implement data push from scripts. Fixes the problem where apps would have to poll to monitor a scripts state.
Wu-cheng Li [Mon, 12 Oct 2009 18:44:39 +0000 (11:44 -0700)]
am
3616d154: am
80fff7a5: am
962f2536: Merge change I547cff66 into eclair
Merge commit '
3616d15451734bd3b563d73f9c2f25c19d7df75c'
* commit '
3616d15451734bd3b563d73f9c2f25c19d7df75c':
Add zoom functions and sendCommand.
Fred Quintana [Mon, 12 Oct 2009 18:44:28 +0000 (11:44 -0700)]
Fred Quintana [Mon, 12 Oct 2009 18:44:16 +0000 (11:44 -0700)]
am
11aaaa70: am
77a7bdce: am
5bba632d: - hide Entity and all its references - remove updateEntity and insertEntity, since they are not used - add the RawContacts.Entity class, which is used in lieu of the android.content.Entity
Merge commit '
11aaaa70b75aa919b385289c5b06bbd20f9e424d'
* commit '
11aaaa70b75aa919b385289c5b06bbd20f9e424d':
- hide Entity and all its references
Suchi Amalapurapu [Mon, 12 Oct 2009 18:44:05 +0000 (11:44 -0700)]
am
5a535026: am
ef3c63ad: am
5163cd6d: Merge change I5be3d603 into eclair
Merge commit '
5a535026bfc1d091c0d029b21cc63f929c2def0a'
* commit '
5a535026bfc1d091c0d029b21cc63f929c2def0a':
Make sdk version and code names static finals in PackageParser.
Daisuke Miyakawa [Mon, 12 Oct 2009 18:41:20 +0000 (11:41 -0700)]
am
4613007b: am
629f94fa: am
ccc214b2: Merge change I6a0b14bd into eclair
Merge commit '
4613007b5755ed95a3a649909b4702400863f9b4'
* commit '
4613007b5755ed95a3a649909b4702400863f9b4':
Make VCardComposer create the instance for mHandlerList.
Evan Millar [Mon, 12 Oct 2009 18:40:55 +0000 (11:40 -0700)]
am
d25a60c9: am
6cd206ab: am
9c3c276a: Merge change I8333dcc4 into eclair
Merge commit '
d25a60c95822ffa1e5d1b312791bc7ed2e2817d1'
* commit '
d25a60c95822ffa1e5d1b312791bc7ed2e2817d1':
New section header and divider assets.
Bjorn Bringert [Mon, 12 Oct 2009 18:40:21 +0000 (11:40 -0700)]
am
66b6dc68: am
2235a020: am
030b2cf1: Merge change I76d7ba61 into eclair
Merge commit '
66b6dc68ad9aa5c38258bb84259dc23ce5acae24'
* commit '
66b6dc68ad9aa5c38258bb84259dc23ce5acae24':
Pixel tweak search dialog to match search widget
Xavier Ducrohet [Mon, 12 Oct 2009 18:40:11 +0000 (11:40 -0700)]
am
3557d5bc: am
9cf2bbb0: am
841a8eea: Merge change I24895c35 into eclair
Merge commit '
3557d5bc9eb8ac33641430ca52d8e2121d0f1a4b'
* commit '
3557d5bc9eb8ac33641430ca52d8e2121d0f1a4b':
Reimplement all the method of Paint for layoutlib
Marco Nelissen [Mon, 12 Oct 2009 18:40:01 +0000 (11:40 -0700)]
am
2c3dc14a: am
a97402e1: am
c39d2e3c: Music visualizer support hack. This currently assumes 44k stereo (won\'t crash on other formats, but won\'t give the correct results either), and links statically with libspeex to get FFT data, increasing the size of libmedia by
Merge commit '
2c3dc14acb7308570b9d695ba9ac904a9502b043'
* commit '
2c3dc14acb7308570b9d695ba9ac904a9502b043':
Music visualizer support hack.
Nick Pelly [Mon, 12 Oct 2009 18:38:48 +0000 (11:38 -0700)]
Nick Pelly [Mon, 12 Oct 2009 18:38:32 +0000 (11:38 -0700)]
am
a1cb6a64: am
460965c2: am
24bb9b8a: Provide an API for apps to use a dynamic RFCOMM channel and SDP record.
Merge commit '
a1cb6a64c6710d46cc8673bc17db3bdb5c7bbc09'
* commit '
a1cb6a64c6710d46cc8673bc17db3bdb5c7bbc09':
Provide an API for apps to use a dynamic RFCOMM channel and SDP record.
Mike Lockwood [Mon, 12 Oct 2009 18:37:39 +0000 (11:37 -0700)]
am
2d0dee0e: am
0daf3e91: am
7fdd67d3: Merge change I5b650a61 into eclair
Merge commit '
2d0dee0e6ccebced9eac11dec24fbb66a1a40b2b'
* commit '
2d0dee0e6ccebced9eac11dec24fbb66a1a40b2b':
dumpstate: Emit a logcat message at beginning and end of execution.
Tammo Spalink [Mon, 12 Oct 2009 18:36:48 +0000 (11:36 -0700)]
am
7589ae77: am
ef5aed64: am
5c8dba21: Merge change I61aac7b3 into eclair
Merge commit '
7589ae77224a28a2162cde74c3ae8b1d826c635c'
* commit '
7589ae77224a28a2162cde74c3ae8b1d826c635c':
Add PERIOD char to CDMA address sugar list.
Fred Quintana [Mon, 12 Oct 2009 18:35:13 +0000 (11:35 -0700)]
am
70cdb4d6: am
0eb2d838: am
5fbaefc3: Merge change I4db3a5b3 into eclair
Merge commit '
70cdb4d684e2821b614562fdb868140154db0026'
* commit '
70cdb4d684e2821b614562fdb868140154db0026':
fix a javadoc build breakage
Xavier Ducrohet [Mon, 12 Oct 2009 18:34:11 +0000 (11:34 -0700)]
am
636d9cd6: am
5becdc32: am
a970bf52: Merge change I34f51342 into eclair
Merge commit '
636d9cd63b77a87e6cb627a90cc8f37e81bedb14'
* commit '
636d9cd63b77a87e6cb627a90cc8f37e81bedb14':
Fix the layoutlib test to run from adt-tests.
Dianne Hackborn [Mon, 12 Oct 2009 18:34:00 +0000 (11:34 -0700)]
am
4bc6158d: am
baad552d: am
68d881cf: Fix issue #
2166755: BroadcastReceiver trying to return result during a non-ordered broadcast
Merge commit '
4bc6158d6bdeff796cfd61d489c01db0d203534c'
* commit '
4bc6158d6bdeff796cfd61d489c01db0d203534c':
Fix issue #
2166755: BroadcastReceiver trying to return result during a non-ordered broadcast
Xavier Ducrohet [Mon, 12 Oct 2009 18:33:44 +0000 (11:33 -0700)]
am
5903a83d: am
864cbf5f: am
71060f29: Merge change I8874a405 into eclair
Merge commit '
5903a83df1ebca83ce1e9a05f11a21701db48692'
* commit '
5903a83df1ebca83ce1e9a05f11a21701db48692':
Refactor class/method names used by layoutlib_create.
Romain Guy [Mon, 12 Oct 2009 18:33:30 +0000 (11:33 -0700)]
am
e1bf39bc: am
cb40ba28: am
89c76843: Merge change I9b771df3 into eclair
Merge commit '
e1bf39bc764c78344dd2a6c59c5709919bdc1da9'
* commit '
e1bf39bc764c78344dd2a6c59c5709919bdc1da9':
Make sure AsyncTask sens a null result to onPostExecute() when cancelled.
Fred Quintana [Mon, 12 Oct 2009 18:32:39 +0000 (11:32 -0700)]
am
4df43ae4: am
7d7ab5ae: am
24f32b32: Merge change I89c40f50 into eclair
Merge commit '
4df43ae4a793ac81d95c0b50967d444ca2d28ffa'
* commit '
4df43ae4a793ac81d95c0b50967d444ca2d28ffa':
fix a javadoc build breakage
Daisuke Miyakawa [Mon, 12 Oct 2009 18:32:00 +0000 (11:32 -0700)]
am
36cad7be: am
07086eb9: Merge change Ifb63d236 into eclair-mr2
Merge commit '
36cad7be504608a538c845b4a44f0dcee157a338'
* commit '
36cad7be504608a538c845b4a44f0dcee157a338':
Add cancel() VCardDataBuilder, which is intended to remove