OSDN Git Service
Elliott Hughes [Wed, 16 Sep 2009 01:20:04 +0000 (18:20 -0700)]
am
d6b10fb8: Merge change 25168 into eclair
Merge commit '
d6b10fb86229ed0e904138ec4604066ea85059db' into eclair-plus-aosp
* commit '
d6b10fb86229ed0e904138ec4604066ea85059db':
Preload Resources$DefaultTimeZones.
Android (Google) Code Review [Wed, 16 Sep 2009 01:15:38 +0000 (21:15 -0400)]
Merge change 25168 into eclair
* changes:
Preload Resources$DefaultTimeZones.
Nick Pelly [Wed, 16 Sep 2009 01:15:24 +0000 (18:15 -0700)]
am
e74050a9: Merge change 25175 into eclair
Merge commit '
e74050a9ca248eb6a8d3d8fc2d7712b340afddcc' into eclair-plus-aosp
* commit '
e74050a9ca248eb6a8d3d8fc2d7712b340afddcc':
Allow only System Service to send most Bluetooth intents.
Dirk Dougherty [Wed, 16 Sep 2009 01:12:44 +0000 (18:12 -0700)]
am
5d55edc9: am
3dc0f94c: Misc. updates for 1.6 release notes and requirements docs.
Merge commit '
5d55edc9401c3240570b4cdc46eda7c4f4eac841' into eclair-plus-aosp
* commit '
5d55edc9401c3240570b4cdc46eda7c4f4eac841':
Misc. updates for 1.6 release notes and requirements docs.
Android (Google) Code Review [Wed, 16 Sep 2009 01:08:37 +0000 (21:08 -0400)]
Merge change 25175 into eclair
* changes:
Allow only System Service to send most Bluetooth intents.
Dirk Dougherty [Wed, 16 Sep 2009 01:05:49 +0000 (18:05 -0700)]
am
3dc0f94c: Misc. updates for 1.6 release notes and requirements docs.
Merge commit '
3dc0f94cd44df2f9310946b0a0a1c7f8c6d95af5' into eclair
* commit '
3dc0f94cd44df2f9310946b0a0a1c7f8c6d95af5':
Misc. updates for 1.6 release notes and requirements docs.
Mathias Agopian [Wed, 16 Sep 2009 00:41:49 +0000 (17:41 -0700)]
am
5446ea77: Merge change 25176 into eclair
Merge commit '
5446ea77bcd7cf3d234f7198d073c99f6519662f' into eclair-plus-aosp
* commit '
5446ea77bcd7cf3d234f7198d073c99f6519662f':
fix [
2122448] android_native_window_t::setUsage() only reallocates the first buffer
Mike Reed [Wed, 16 Sep 2009 00:37:16 +0000 (17:37 -0700)]
am
4e54f330: update for new plugin api
Merge commit '
4e54f3309ec9dac3cf69ffa73ec7c5378f19dffb' into eclair-plus-aosp
* commit '
4e54f3309ec9dac3cf69ffa73ec7c5378f19dffb':
update for new plugin api
Android (Google) Code Review [Wed, 16 Sep 2009 00:35:15 +0000 (20:35 -0400)]
Merge change 25176 into eclair
* changes:
fix [
2122448] android_native_window_t::setUsage() only reallocates the first buffer
Mathias Agopian [Wed, 16 Sep 2009 00:34:04 +0000 (17:34 -0700)]
fix [
2122448] android_native_window_t::setUsage() only reallocates the first buffer
Derek Sollenberger [Wed, 16 Sep 2009 00:13:20 +0000 (17:13 -0700)]
am
64ce0f8f: Merge change 24200 into eclair
Merge commit '
64ce0f8f5315e3a364aea047360520b097e7a7cd' into eclair-plus-aosp
* commit '
64ce0f8f5315e3a364aea047360520b097e7a7cd':
First pass at replacing native plugin views with java.
Android (Google) Code Review [Wed, 16 Sep 2009 00:03:16 +0000 (20:03 -0400)]
Merge change 24200 into eclair
* changes:
First pass at replacing native plugin views with java.
Eric Fischer [Tue, 15 Sep 2009 23:48:12 +0000 (16:48 -0700)]
am
b6a7ea54: Merge change 25153 into eclair
Merge commit '
b6a7ea540ef9537bcedc707a87514e63438a533a' into eclair-plus-aosp
* commit '
b6a7ea540ef9537bcedc707a87514e63438a533a':
Reconcile the character popups for the hard and soft keyboards.
Romain Guy [Tue, 15 Sep 2009 23:48:06 +0000 (16:48 -0700)]
am
9c39c6d0: Merge change 25162 into eclair
Merge commit '
9c39c6d02fc31e18f3abafb89cc29520cb539cb8' into eclair-plus-aosp
* commit '
9c39c6d02fc31e18f3abafb89cc29520cb539cb8':
Build the BitmapShader if it hasn't been built yet.
Android (Google) Code Review [Tue, 15 Sep 2009 23:43:00 +0000 (19:43 -0400)]
Merge change 25153 into eclair
* changes:
Reconcile the character popups for the hard and soft keyboards.
Android (Google) Code Review [Tue, 15 Sep 2009 23:40:58 +0000 (19:40 -0400)]
Merge change 25162 into eclair
* changes:
Build the BitmapShader if it hasn't been built yet.
Libin Tang [Tue, 15 Sep 2009 23:24:09 +0000 (16:24 -0700)]
am
d1d67782: Merge change 25147 into eclair
Merge commit '
d1d6778247d4b3798f9b9fafca4312a348826a0b' into eclair-plus-aosp
* commit '
d1d6778247d4b3798f9b9fafca4312a348826a0b':
Fix call collision issue
Andreas Huber [Tue, 15 Sep 2009 23:19:35 +0000 (16:19 -0700)]
am
781a5dd5: Merge change 25142 into eclair
Merge commit '
781a5dd5279b7a57c2c0b1d78cb2a4e7acbf1715' into eclair-plus-aosp
* commit '
781a5dd5279b7a57c2c0b1d78cb2a4e7acbf1715':
The 8k chipset qcom decoders require that the input buffers be allocated using OMX_AllocateBuffer rather than OMX_UseBuffer for now.
Android (Google) Code Review [Tue, 15 Sep 2009 23:17:14 +0000 (19:17 -0400)]
Merge change 25147 into eclair
* changes:
Fix call collision issue
Android (Google) Code Review [Tue, 15 Sep 2009 23:11:17 +0000 (19:11 -0400)]
Merge change 25142 into eclair
* changes:
The 8k chipset qcom decoders require that the input buffers be allocated using OMX_AllocateBuffer rather than OMX_UseBuffer for now.
Dmitri Plotnikov [Tue, 15 Sep 2009 23:03:59 +0000 (16:03 -0700)]
am
90142c95: Adding a system property to log slow queries
Merge commit '
90142c959e6de38eae1563cd8b3d2d448393e15f' into eclair-plus-aosp
* commit '
90142c959e6de38eae1563cd8b3d2d448393e15f':
Adding a system property to log slow queries
Andreas Huber [Tue, 15 Sep 2009 21:51:30 +0000 (14:51 -0700)]
am
a4fe2aca: Merge change 25128 into eclair
Merge commit '
a4fe2aca527ee45ddde6ace2316cad27dd487379' into eclair-plus-aosp
* commit '
a4fe2aca527ee45ddde6ace2316cad27dd487379':
Support CbYCrY -> RGB565 color conversion in IOMXRenderer.
Andreas Huber [Tue, 15 Sep 2009 21:51:23 +0000 (14:51 -0700)]
am
0edada08: Merge change 25101 into eclair
Merge commit '
0edada085e175e81b6d38a48b5b022917b410a98' into eclair-plus-aosp
* commit '
0edada085e175e81b6d38a48b5b022917b410a98':
Added an API IOMX::createRendererFromJavaSurface.
Fred Quintana [Tue, 15 Sep 2009 21:51:16 +0000 (14:51 -0700)]
am
4b687f2e: Merge change 25132 into eclair
Merge commit '
4b687f2eb5461da1d86189d19bfaaf669e24cd90' into eclair-plus-aosp
* commit '
4b687f2eb5461da1d86189d19bfaaf669e24cd90':
fix ContentProviderOperationTest
Android (Google) Code Review [Tue, 15 Sep 2009 21:48:33 +0000 (17:48 -0400)]
Merge change 25128 into eclair
* changes:
Support CbYCrY -> RGB565 color conversion in IOMXRenderer.
Android (Google) Code Review [Tue, 15 Sep 2009 21:48:22 +0000 (17:48 -0400)]
Merge change 25101 into eclair
* changes:
Added an API IOMX::createRendererFromJavaSurface.
Android (Google) Code Review [Tue, 15 Sep 2009 21:42:25 +0000 (17:42 -0400)]
Merge change 25132 into eclair
* changes:
fix ContentProviderOperationTest
Guang Zhu [Tue, 15 Sep 2009 21:25:49 +0000 (14:25 -0700)]
am
617d470d: Merge change 25124 into eclair
Merge commit '
617d470dffdc0b5fa24454b0e07438ad0f4721f9' into eclair-plus-aosp
* commit '
617d470dffdc0b5fa24454b0e07438ad0f4721f9':
Add more error message if the script failed to pull result file from device.
Android (Google) Code Review [Tue, 15 Sep 2009 21:18:02 +0000 (17:18 -0400)]
Merge change 25124 into eclair
* changes:
Add more error message if the script failed to pull result file from device.
Yu Shan Emily Lau [Tue, 15 Sep 2009 21:16:27 +0000 (14:16 -0700)]
am
4d445d68: Merge change 24955 into eclair
Merge commit '
4d445d682e6380b26fbe5cd06cb0ca4c532739e7' into eclair-plus-aosp
* commit '
4d445d682e6380b26fbe5cd06cb0ca4c532739e7':
new file: tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaProfileReader.java
Romain Guy [Tue, 15 Sep 2009 21:16:21 +0000 (14:16 -0700)]
am
7bd66001: Merge change 25117 into eclair
Merge commit '
7bd660012ca5d946f4f4efb9d357a785e6a4d4eb' into eclair-plus-aosp
* commit '
7bd660012ca5d946f4f4efb9d357a785e6a4d4eb':
Preserve ListView's pressed state when the adapter changes its content while the user is pressing an item.
Android (Google) Code Review [Tue, 15 Sep 2009 21:10:54 +0000 (17:10 -0400)]
Merge change 24955 into eclair
* changes:
new file: tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaProfileReader.java modified: tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaRecorderTest.java Added a new test suite which parse the system media properties and group in into the high quality and low quality recording tests.
Android (Google) Code Review [Tue, 15 Sep 2009 20:57:53 +0000 (16:57 -0400)]
Merge change 25117 into eclair
* changes:
Preserve ListView's pressed state when the adapter changes its content while the user is pressing an item.
Dirk Dougherty [Tue, 15 Sep 2009 20:56:36 +0000 (13:56 -0700)]
am
f5a760f1: am
4be629f2: Update sizes/checksums for SDK packages.
Merge commit '
f5a760f17527b91c864336ea10b52322d0667ec5' into eclair-plus-aosp
* commit '
f5a760f17527b91c864336ea10b52322d0667ec5':
Update sizes/checksums for SDK packages.
Scott Main [Tue, 15 Sep 2009 20:56:29 +0000 (13:56 -0700)]
am
2eeb1f0e: am
ca75d7f5: docs only. superficial typo
Merge commit '
2eeb1f0ed0ca9648e3a3b9120f945edd0b1a4a81' into eclair-plus-aosp
* commit '
2eeb1f0ed0ca9648e3a3b9120f945edd0b1a4a81':
docs only.
Cary Clark [Tue, 15 Sep 2009 20:51:26 +0000 (13:51 -0700)]
am
7ad6dc27: Merge change 25110 into eclair
Merge commit '
7ad6dc27176a0d3f5374d7d3b9bffda492296237' into eclair-plus-aosp
* commit '
7ad6dc27176a0d3f5374d7d3b9bffda492296237':
synchronize access to pictureReady, copyContentPicture
jsh [Tue, 15 Sep 2009 20:51:19 +0000 (13:51 -0700)]
am
d631fedb: Merge change 25109 into eclair
Merge commit '
d631fedb6cec492812afc5082461afcbfa4ae07f' into eclair-plus-aosp
* commit '
d631fedb6cec492812afc5082461afcbfa4ae07f':
Some SMS logging improvements.
Jean-Michel Trivi [Tue, 15 Sep 2009 20:47:13 +0000 (13:47 -0700)]
am
91a5d831: am
b5308a70: Merge change 24816 into donut
Merge commit '
91a5d831d6e2311d4129cb6086a67ab66874992c' into eclair-plus-aosp
* commit '
91a5d831d6e2311d4129cb6086a67ab66874992c':
TextToSpeech javadoc update.
Scott Main [Tue, 15 Sep 2009 20:47:06 +0000 (13:47 -0700)]
am
bc663a65: am
528954c4: docs only. fix sample code errors per bug
2115299
Merge commit '
bc663a65315e6eab9d92316072250ea9efc9f18a' into eclair-plus-aosp
* commit '
bc663a65315e6eab9d92316072250ea9efc9f18a':
docs only.
Dirk Dougherty [Tue, 15 Sep 2009 20:47:02 +0000 (13:47 -0700)]
am
4be629f2: Update sizes/checksums for SDK packages.
Merge commit '
4be629f2548483c37483904f1c9121e8fc248640' into eclair
* commit '
4be629f2548483c37483904f1c9121e8fc248640':
Update sizes/checksums for SDK packages.
Mike Reed [Tue, 15 Sep 2009 20:46:59 +0000 (13:46 -0700)]
am
df4cf297: redraw once more on a touch-up if we\'ve been dragging, so we can redraw in high-quality mode update dox on BlurMaskFilter
Merge commit '
df4cf29715146d67306595108c565d9848a6ae1a' into eclair-plus-aosp
* commit '
df4cf29715146d67306595108c565d9848a6ae1a':
redraw once more on a touch-up if we've been dragging, so we can redraw in high-quality mode
Scott Main [Tue, 15 Sep 2009 20:46:54 +0000 (13:46 -0700)]
Evan Millar [Tue, 15 Sep 2009 20:46:53 +0000 (13:46 -0700)]
am
e727f18c: Add the FasttrackBadgeWidget.
Merge commit '
e727f18cf2649d07a89aba19ecefed93c9d0b305' into eclair-plus-aosp
* commit '
e727f18cf2649d07a89aba19ecefed93c9d0b305':
Add the FasttrackBadgeWidget.
Mike Lockwood [Tue, 15 Sep 2009 20:46:43 +0000 (13:46 -0700)]
am
6d9eebe7: Merge change 25090 into eclair
Merge commit '
6d9eebe7320637f0256c077ba5ed6724b5a4ab0d' into eclair-plus-aosp
* commit '
6d9eebe7320637f0256c077ba5ed6724b5a4ab0d':
Move backlight brightness from HardwareService to PowerManager
Jason Sams [Tue, 15 Sep 2009 20:46:32 +0000 (13:46 -0700)]
am
ffa18dfa: Merge change 25100 into eclair
Merge commit '
ffa18dfac0b5e9e665897c9b1c107cb4268006b2' into eclair-plus-aosp
* commit '
ffa18dfac0b5e9e665897c9b1c107cb4268006b2':
Implement Object readback.
Fred Quintana [Tue, 15 Sep 2009 20:46:21 +0000 (13:46 -0700)]
am
0ae011b6: Merge change 24990 into eclair
Merge commit '
0ae011b6f6d709d840f60f25df2046c9545a10a2' into eclair-plus-aosp
* commit '
0ae011b6f6d709d840f60f25df2046c9545a10a2':
change to use the new CALLER_IS_SYNCADAPTER flag
Bjorn Bringert [Tue, 15 Sep 2009 20:45:49 +0000 (13:45 -0700)]
am
88cd369c: Merge change 25048 into eclair
Merge commit '
88cd369c33ed2fe194e889b05559eb172e4896ac' into eclair-plus-aosp
* commit '
88cd369c33ed2fe194e889b05559eb172e4896ac':
Revert "Deprecate showSearchIconAsBadge and icon search attrs"
Android (Google) Code Review [Tue, 15 Sep 2009 20:38:15 +0000 (16:38 -0400)]
Merge change 25110 into eclair
* changes:
synchronize access to pictureReady, copyContentPicture
Android (Google) Code Review [Tue, 15 Sep 2009 20:37:36 +0000 (16:37 -0400)]
Merge change 25109 into eclair
* changes:
Some SMS logging improvements.
Jean-Michel Trivi [Tue, 15 Sep 2009 20:18:46 +0000 (13:18 -0700)]
am
b5308a70: Merge change 24816 into donut
Merge commit '
b5308a7051fedacf289470c8a7e21b63af9d4db8' into eclair
* commit '
b5308a7051fedacf289470c8a7e21b63af9d4db8':
TextToSpeech javadoc update.
Scott Main [Tue, 15 Sep 2009 20:18:34 +0000 (13:18 -0700)]
am
528954c4: docs only. fix sample code errors per bug
2115299
Merge commit '
528954c4d63980c0515528624130477f921cbc60' into eclair
* commit '
528954c4d63980c0515528624130477f921cbc60':
docs only.
Android (Google) Code Review [Tue, 15 Sep 2009 19:50:51 +0000 (15:50 -0400)]
Merge change 25090 into eclair
* changes:
Move backlight brightness from HardwareService to PowerManager
Android (Google) Code Review [Tue, 15 Sep 2009 19:40:09 +0000 (15:40 -0400)]
Merge change 25100 into eclair
* changes:
Implement Object readback.
Android (Google) Code Review [Tue, 15 Sep 2009 19:26:42 +0000 (15:26 -0400)]
Merge change 24990 into eclair
* changes:
change to use the new CALLER_IS_SYNCADAPTER flag
Ken Schultz [Tue, 15 Sep 2009 18:53:39 +0000 (11:53 -0700)]
am
74a0b820: Merge change 25089 into eclair
Merge commit '
74a0b8209e0228bb48739a4b25e489e2eba2a2c4' into eclair-plus-aosp
* commit '
74a0b8209e0228bb48739a4b25e489e2eba2a2c4':
DockObserver wakes the display when broadcasting a change
Dianne Hackborn [Tue, 15 Sep 2009 18:53:32 +0000 (11:53 -0700)]
am
1cd403ea: Add SurfaceView API to put surface on top of window.
Merge commit '
1cd403eaac24e0e84619dea07e2d1d60e58e1fd2' into eclair-plus-aosp
* commit '
1cd403eaac24e0e84619dea07e2d1d60e58e1fd2':
Add SurfaceView API to put surface on top of window.
Android (Google) Code Review [Tue, 15 Sep 2009 18:51:56 +0000 (14:51 -0400)]
Merge change 25048 into eclair
* changes:
Revert "Deprecate showSearchIconAsBadge and icon search attrs"
Android (Google) Code Review [Tue, 15 Sep 2009 18:44:34 +0000 (14:44 -0400)]
Merge change 25089 into eclair
* changes:
DockObserver wakes the display when broadcasting a change - normal display timeout applies after wake
Brett Chabot [Tue, 15 Sep 2009 18:26:12 +0000 (11:26 -0700)]
am
d583a015: Merge change 25078 into eclair
Merge commit '
d583a015bcbac8718cbf5ed8a1c40d074c65a226' into eclair-plus-aosp
* commit '
d583a015bcbac8718cbf5ed8a1c40d074c65a226':
Fix FileObserverTest#testRun.
Android (Google) Code Review [Tue, 15 Sep 2009 18:18:57 +0000 (14:18 -0400)]
Merge change 25078 into eclair
* changes:
Fix FileObserverTest#testRun.
Christian Gustafsson [Tue, 15 Sep 2009 18:05:23 +0000 (11:05 -0700)]
am
70f74b79: Assemble WAP datagram correctly when segments arrive out of order
Merge commit '
70f74b79c3e4c88e0e7b747796f76187e4ea8259' into eclair-plus-aosp
* commit '
70f74b79c3e4c88e0e7b747796f76187e4ea8259':
Assemble WAP datagram correctly when segments arrive out of order
Grace Kloba [Tue, 15 Sep 2009 18:00:40 +0000 (11:00 -0700)]
am
04b2868c: WebView zoom clean up
Merge commit '
04b2868c74a54cf711552262f0ad20d234b627b4' into eclair-plus-aosp
* commit '
04b2868c74a54cf711552262f0ad20d234b627b4':
WebView zoom clean up
Cary Clark [Tue, 15 Sep 2009 17:40:54 +0000 (10:40 -0700)]
am
db6d939d: if the cursor and focus don\'t match, match them on text view clicks
Merge commit '
db6d939d2bbf457b1caa5479a60dae5e90d023e1' into eclair-plus-aosp
* commit '
db6d939d2bbf457b1caa5479a60dae5e90d023e1':
if the cursor and focus don't match, match them on text view clicks
Cary Clark [Tue, 15 Sep 2009 17:40:49 +0000 (10:40 -0700)]
am
df344375: compute Y scroll max by scaling only, ignoring title bar height
Merge commit '
df344375a93f3bfe0360f5436c0866f44b7fb6cc' into eclair-plus-aosp
* commit '
df344375a93f3bfe0360f5436c0866f44b7fb6cc':
compute Y scroll max by scaling only, ignoring title bar height
Mike Reed [Tue, 15 Sep 2009 17:26:07 +0000 (10:26 -0700)]
am
5adeba4b: Merge change 25059 into eclair
Merge commit '
5adeba4b7f63081257f9d0fb65127bdce0399c79' into eclair-plus-aosp
* commit '
5adeba4b7f63081257f9d0fb65127bdce0399c79':
special-case coordinate conversion when we are taking content coordinates to be invalidate. We need to
Android (Google) Code Review [Tue, 15 Sep 2009 17:19:56 +0000 (13:19 -0400)]
Merge change 25059 into eclair
* changes:
special-case coordinate conversion when we are taking content coordinates to be invalidate. We need to round "out" these, to account for the slop in antialiasing, rather than using the existing routines that (correctly) round.
Tao Liejun [Tue, 15 Sep 2009 17:12:01 +0000 (10:12 -0700)]
am
e80534ff: Fix connection ID issue in Obex lib
Merge commit '
e80534ff59b2e62a0ddf4359147b81f5ba10de86' into eclair-plus-aosp
* commit '
e80534ff59b2e62a0ddf4359147b81f5ba10de86':
Fix connection ID issue in Obex lib
Nick Pelly [Tue, 15 Sep 2009 15:35:11 +0000 (08:35 -0700)]
am
82dbf678: Merge change 24998 into eclair
Merge commit '
82dbf6785184a9a0808210294365e32ff21add9c' into eclair-plus-aosp
* commit '
82dbf6785184a9a0808210294365e32ff21add9c':
Add Panasonic KX-TH112 to blacklist.
Eric Laurent [Tue, 15 Sep 2009 15:35:04 +0000 (08:35 -0700)]
am
2bccbcc7: Merge change 25050 into eclair
Merge commit '
2bccbcc777ca48a08663c16e90ea3f76ace6eb07' into eclair-plus-aosp
* commit '
2bccbcc777ca48a08663c16e90ea3f76ace6eb07':
Fix issue
2118464: cannot play ring tones and notifications after disconnecting BT headset while in call.
Android (Google) Code Review [Tue, 15 Sep 2009 15:29:52 +0000 (11:29 -0400)]
Merge change 24998 into eclair
* changes:
Add Panasonic KX-TH112 to blacklist.
Android (Google) Code Review [Tue, 15 Sep 2009 15:29:23 +0000 (11:29 -0400)]
Merge change 25050 into eclair
* changes:
Fix issue
2118464: cannot play ring tones and notifications after disconnecting BT headset while in call.
Jean-Baptiste Queru [Tue, 15 Sep 2009 14:52:09 +0000 (07:52 -0700)]
merge from open-source master
Mike Lockwood [Tue, 15 Sep 2009 14:38:56 +0000 (07:38 -0700)]
am
f73f91c5: Merge change 25012 into eclair
Merge commit '
f73f91c5b1f66bbe4b3ca59b743a62ad5a65853f' into eclair-plus-aosp
* commit '
f73f91c5b1f66bbe4b3ca59b743a62ad5a65853f':
PowerManagerService: Use 5 cm threshold for the proximity sensor.
Dan Murphy [Tue, 15 Sep 2009 14:38:50 +0000 (07:38 -0700)]
am
4e3cdf85: Merge change 23619 into eclair
Merge commit '
4e3cdf854441b84c15fd9f127127b6d116834c51' into eclair-plus-aosp
* commit '
4e3cdf854441b84c15fd9f127127b6d116834c51':
Add automatic lighting control framework
Android (Google) Code Review [Tue, 15 Sep 2009 14:32:13 +0000 (10:32 -0400)]
Merge change 25012 into eclair
* changes:
PowerManagerService: Use 5 cm threshold for the proximity sensor.
Android (Google) Code Review [Tue, 15 Sep 2009 14:29:26 +0000 (10:29 -0400)]
Merge change 23619 into eclair
* changes:
Add automatic lighting control framework
Chih-Chung Chang [Tue, 15 Sep 2009 14:19:58 +0000 (07:19 -0700)]
am
244f8c26: Fix
2083478: Camera needs an auto-focus cancel API
Merge commit '
244f8c26365a303d9dd861bd48a29a4b48578da1' into eclair-plus-aosp
* commit '
244f8c26365a303d9dd861bd48a29a4b48578da1':
Fix
2083478: Camera needs an auto-focus cancel API
Eric Laurent [Tue, 15 Sep 2009 14:10:12 +0000 (07:10 -0700)]
Fix issue
2118464: cannot play ring tones and notifications after disconnecting BT headset while in call.
The problem comes from the fact that when the duplicated output is closed after BT headset disconnection, the OUTPUT_CLOSED notification is not sent to AudioSystem. Then the mapping between notification stream and duplicated output cached in AudioSystem is not cleared and next time a notification is played, the duplicated output is selected and the createTrack() request is refused by AudioFlinger as the selected output doesn't exist.
The notification is ignored by AudioFlinger because when it is sent by the terminating playback thread, the thread has already been removed from the playback thread list.
The fix consists in sending the notification in closeOutput() and not when exiting the playback thread.
The same fix is applied to record threads.
Chih-Chung Chang [Tue, 15 Sep 2009 06:51:56 +0000 (14:51 +0800)]
Fix
2083478: Camera needs an auto-focus cancel API
Change-Id: I13bda991b32aee47e82b5cf9d43b3021c416a9a2
Eric Laurent [Tue, 15 Sep 2009 06:33:23 +0000 (23:33 -0700)]
am
54c06152: Merge change 24872 into eclair
Merge commit '
54c06152e0d9c666aec61ae5d9686d7d3327ea34' into eclair-plus-aosp
* commit '
54c06152e0d9c666aec61ae5d9686d7d3327ea34':
Fix issue
2115450: a2dp thread is started, even though we are only connected to headset and not playing music.
Android (Google) Code Review [Tue, 15 Sep 2009 06:26:19 +0000 (02:26 -0400)]
Merge change 24872 into eclair
* changes:
Fix issue
2115450: a2dp thread is started, even though we are only connected to headset and not playing music.
Dianne Hackborn [Tue, 15 Sep 2009 04:30:52 +0000 (21:30 -0700)]
am
678b4c20: Merge change 25013 into eclair
Merge commit '
678b4c20cb92ac2b86f13e52ea86d70301358680' into eclair-plus-aosp
* commit '
678b4c20cb92ac2b86f13e52ea86d70301358680':
Various fixed for back key handling.
Android (Google) Code Review [Tue, 15 Sep 2009 04:26:45 +0000 (00:26 -0400)]
Merge change 25013 into eclair
* changes:
Various fixed for back key handling.
Mathias Agopian [Tue, 15 Sep 2009 01:21:10 +0000 (18:21 -0700)]
am
151921a6: Merge change 24977 into eclair
Merge commit '
151921a62485f2141ad1316076c196ef00e1b421' into eclair-plus-aosp
* commit '
151921a62485f2141ad1316076c196ef00e1b421':
add support for RGBX_8888 surfaces in SurfaceFlinger
Daniel Sandler [Tue, 15 Sep 2009 01:14:58 +0000 (18:14 -0700)]
am
bd443c01: Merge change 24887 into eclair
Merge commit '
bd443c01a0fadb2d536ffce1c45950f9037cbc56' into eclair-plus-aosp
* commit '
bd443c01a0fadb2d536ffce1c45950f9037cbc56':
Fix http://b/issue?id=
2098873 (drawing glitch in SeekBar).
Dianne Hackborn [Tue, 15 Sep 2009 01:14:51 +0000 (18:14 -0700)]
am
294cd985: Merge change 24850 into eclair
Merge commit '
294cd9856e30daa07efbdd7d925b3fad8cb123de' into eclair-plus-aosp
* commit '
294cd9856e30daa07efbdd7d925b3fad8cb123de':
Last big work on #
1991910: Make swipes work with capacitive keys
Android (Google) Code Review [Tue, 15 Sep 2009 01:11:56 +0000 (21:11 -0400)]
Merge change 24977 into eclair
* changes:
add support for RGBX_8888 surfaces in SurfaceFlinger
Mathias Agopian [Tue, 15 Sep 2009 01:10:30 +0000 (18:10 -0700)]
add support for RGBX_8888 surfaces in SurfaceFlinger
Android (Google) Code Review [Tue, 15 Sep 2009 01:07:00 +0000 (21:07 -0400)]
Merge change 24887 into eclair
* changes:
Fix http://b/issue?id=
2098873 (drawing glitch in SeekBar).
Android (Google) Code Review [Tue, 15 Sep 2009 00:56:46 +0000 (20:56 -0400)]
Merge change 24850 into eclair
* changes:
Last big work on #
1991910: Make swipes work with capacitive keys
jsh [Tue, 15 Sep 2009 00:48:06 +0000 (17:48 -0700)]
am
53793416: Merge change 24662 into eclair
Merge commit '
53793416d408366270d21f81734997db348bd918' into eclair-plus-aosp
* commit '
53793416d408366270d21f81734997db348bd918':
Fix URI returned by IccProvider.
Jason Sams [Tue, 15 Sep 2009 00:48:00 +0000 (17:48 -0700)]
am
4503cb75: Merge change 24968 into eclair
Merge commit '
4503cb75a02f6465bd576366945a1c5f2c8c13f3' into eclair-plus-aosp
* commit '
4503cb75a02f6465bd576366945a1c5f2c8c13f3':
Minor perf tweak for fountain.
Android (Google) Code Review [Tue, 15 Sep 2009 00:30:43 +0000 (20:30 -0400)]
Merge change 24662 into eclair
* changes:
Fix URI returned by IccProvider.
Android (Google) Code Review [Tue, 15 Sep 2009 00:15:31 +0000 (20:15 -0400)]
Merge change 24968 into eclair
* changes:
Minor perf tweak for fountain.
Dianne Hackborn [Tue, 15 Sep 2009 00:09:28 +0000 (17:09 -0700)]
am
c2974809: Fix issue #
2116977: buttons are huge and bent
Merge commit '
c2974809373697147cbe5754835cc871fb93aef1' into eclair-plus-aosp
* commit '
c2974809373697147cbe5754835cc871fb93aef1':
Fix issue #
2116977: buttons are huge and bent
Debajit Ghosh [Mon, 14 Sep 2009 23:34:39 +0000 (16:34 -0700)]
am
e7f47f50: Merge change 24921 into eclair
Merge commit '
e7f47f50ad0a97e32c87104e56f311db910e98f1' into eclair-plus-aosp
* commit '
e7f47f50ad0a97e32c87104e56f311db910e98f1':
add system properties for experimenting with sync timeouts.
Leon Scroggins [Mon, 14 Sep 2009 23:34:33 +0000 (16:34 -0700)]
am
74077c8f: Clear the password field when reloading the current page.
Merge commit '
74077c8f2ed67b79be67df853158932fbd774865' into eclair-plus-aosp
* commit '
74077c8f2ed67b79be67df853158932fbd774865':
Clear the password field when reloading the current page.
Android (Google) Code Review [Mon, 14 Sep 2009 23:30:37 +0000 (19:30 -0400)]
Merge change 24921 into eclair
* changes:
add system properties for experimenting with sync timeouts.
Mathias Agopian [Mon, 14 Sep 2009 23:09:10 +0000 (16:09 -0700)]
am
b06aac86: Merge change 24948 into eclair
Merge commit '
b06aac86d1be8cd018f2568d64f50d61c421d1f0' into eclair-plus-aosp
* commit '
b06aac86d1be8cd018f2568d64f50d61c421d1f0':
fix [
2117464] SF can crash when calling dumpsys
Mathias Agopian [Mon, 14 Sep 2009 23:09:04 +0000 (16:09 -0700)]
am
a1212578: Merge change 24947 into eclair
Merge commit '
a1212578bfd11bd391c686c82c18b21b4a3a69b4' into eclair-plus-aosp
* commit '
a1212578bfd11bd391c686c82c18b21b4a3a69b4':
make sure to update the tail pointer when undoing a dequeue