OSDN Git Service
Daniel Sandler [Mon, 23 Nov 2009 16:50:12 +0000 (08:50 -0800)]
am
40c1dbf0: am
a59a01ab: Merge change I43f72dd1 into eclair
Merge commit '
40c1dbf081035f878b96dd67ef112eb49001c087' into eclair-mr2-plus-aosp
* commit '
40c1dbf081035f878b96dd67ef112eb49001c087':
Don't block TIME_TICK broadcasts in the DigitalClock widget.
Daniel Sandler [Mon, 23 Nov 2009 16:44:27 +0000 (08:44 -0800)]
am
a59a01ab: Merge change I43f72dd1 into eclair
Merge commit '
a59a01ab2b959a8a5aeb09dd664d5be193fd8219' into eclair-mr2
* commit '
a59a01ab2b959a8a5aeb09dd664d5be193fd8219':
Don't block TIME_TICK broadcasts in the DigitalClock widget.
Android (Google) Code Review [Mon, 23 Nov 2009 16:39:24 +0000 (08:39 -0800)]
Merge change I43f72dd1 into eclair
* changes:
Don't block TIME_TICK broadcasts in the DigitalClock widget.
Jaikumar Ganesh [Mon, 23 Nov 2009 06:10:15 +0000 (22:10 -0800)]
am
8631e554: am
ad431ad8: Merge change Ia3acc2ee into eclair
Merge commit '
8631e55425b2ab81eb74396e6834c6f7a4549804' into eclair-mr2-plus-aosp
* commit '
8631e55425b2ab81eb74396e6834c6f7a4549804':
Fix pairings lost on reboot.
Jaikumar Ganesh [Mon, 23 Nov 2009 06:02:17 +0000 (22:02 -0800)]
am
ad431ad8: Merge change Ia3acc2ee into eclair
Merge commit '
ad431ad8631d8b19b04193ff1f89a955a7643c60' into eclair-mr2
* commit '
ad431ad8631d8b19b04193ff1f89a955a7643c60':
Fix pairings lost on reboot.
Android (Google) Code Review [Mon, 23 Nov 2009 05:54:29 +0000 (21:54 -0800)]
Merge change Ia3acc2ee into eclair
* changes:
Fix pairings lost on reboot.
Eric Laurent [Sat, 21 Nov 2009 08:26:09 +0000 (00:26 -0800)]
am
949c572a: am
e7800946: Merge change I49f02be9 into eclair
Merge commit '
949c572a16881aa40079a42bf7682637b23eb16a' into eclair-mr2-plus-aosp
* commit '
949c572a16881aa40079a42bf7682637b23eb16a':
Issue
2265163: Audio still reported routed through earpiece on sholes
Eric Laurent [Sat, 21 Nov 2009 08:21:15 +0000 (00:21 -0800)]
am
e7800946: Merge change I49f02be9 into eclair
Merge commit '
e7800946a42c0ebe8e0b3f6eba04a96a9641aaff' into eclair-mr2
* commit '
e7800946a42c0ebe8e0b3f6eba04a96a9641aaff':
Issue
2265163: Audio still reported routed through earpiece on sholes
Android (Google) Code Review [Sat, 21 Nov 2009 08:18:24 +0000 (00:18 -0800)]
Merge change I49f02be9 into eclair
* changes:
Issue
2265163: Audio still reported routed through earpiece on sholes
Scott Main [Sat, 21 Nov 2009 01:12:37 +0000 (17:12 -0800)]
am
30a4b8a1: am
256da9fb: am
160ab363: Merge change I0c172ebf into eclair-sdk
Merge commit '
30a4b8a180813ae9a1846fdd7219ebe5592eb06b' into eclair-mr2-plus-aosp
* commit '
30a4b8a180813ae9a1846fdd7219ebe5592eb06b':
docs change for ESR: add platform notes document for
Scott Main [Sat, 21 Nov 2009 01:08:09 +0000 (17:08 -0800)]
am
256da9fb: am
160ab363: Merge change I0c172ebf into eclair-sdk
Merge commit '
256da9fb007ac0722a5b1854befda7e7bed2564e' into eclair-mr2
* commit '
256da9fb007ac0722a5b1854befda7e7bed2564e':
docs change for ESR: add platform notes document for
Scott Main [Sat, 21 Nov 2009 01:03:29 +0000 (17:03 -0800)]
am
160ab363: Merge change I0c172ebf into eclair-sdk
Merge commit '
160ab363d738728456d561bb80d54d3448e7580a' into eclair
* commit '
160ab363d738728456d561bb80d54d3448e7580a':
docs change for ESR: add platform notes document for
Android (Google) Code Review [Sat, 21 Nov 2009 00:59:57 +0000 (16:59 -0800)]
Merge change I0c172ebf into eclair-sdk
* changes:
docs change for ESR: add platform notes document for Android 2.0.1. Also update the homepage sdk and adp announcements.
Dianne Hackborn [Sat, 21 Nov 2009 00:49:21 +0000 (16:49 -0800)]
am
dbf3d3ac: am
af1f42be: Fix issue #
2271668: Live Wallpaper Force-Close when changing from live wallpaper to picasa wallpaper
Merge commit '
dbf3d3acc18f86a671096f1626d80d055bc36e11' into eclair-mr2-plus-aosp
* commit '
dbf3d3acc18f86a671096f1626d80d055bc36e11':
Fix issue #
2271668: Live Wallpaper Force-Close when changing from live wallpaper to picasa wallpaper
Dianne Hackborn [Sat, 21 Nov 2009 00:43:20 +0000 (16:43 -0800)]
am
af1f42be: Fix issue #
2271668: Live Wallpaper Force-Close when changing from live wallpaper to picasa wallpaper
Merge commit '
af1f42be96a6ffa7a9b63e199e1614281ea3282d' into eclair-mr2
* commit '
af1f42be96a6ffa7a9b63e199e1614281ea3282d':
Fix issue #
2271668: Live Wallpaper Force-Close when changing from live wallpaper to picasa wallpaper
Dianne Hackborn [Fri, 20 Nov 2009 23:26:50 +0000 (15:26 -0800)]
am
f2900600: am
1824ec8c: Merge change If2b0bbed into eclair
Merge commit '
f29006000cfbcf7732df5d5432ab5ff8a2dbf691' into eclair-mr2-plus-aosp
* commit '
f29006000cfbcf7732df5d5432ab5ff8a2dbf691':
Debugging for issue #
2228381 android.view.InflateException
Dianne Hackborn [Fri, 20 Nov 2009 23:20:34 +0000 (15:20 -0800)]
am
1824ec8c: Merge change If2b0bbed into eclair
Merge commit '
1824ec8c127e3a8ef602d027e3c10d81f28320e8' into eclair-mr2
* commit '
1824ec8c127e3a8ef602d027e3c10d81f28320e8':
Debugging for issue #
2228381 android.view.InflateException
Android (Google) Code Review [Fri, 20 Nov 2009 23:12:33 +0000 (15:12 -0800)]
Merge change If2b0bbed into eclair
* changes:
Debugging for issue #
2228381 android.view.InflateException
Wink Saville [Fri, 20 Nov 2009 23:04:31 +0000 (15:04 -0800)]
am
79ff03a8: Merge change I3ae1fb19 into eclair-mr2
Merge commit '
79ff03a84b8f6aa9fc95fba728a131e9c88d1b47' into eclair-mr2-plus-aosp
* commit '
79ff03a84b8f6aa9fc95fba728a131e9c88d1b47':
Increase the default wake lock timeout.
Android (Google) Code Review [Fri, 20 Nov 2009 22:56:21 +0000 (14:56 -0800)]
Merge change I3ae1fb19 into eclair-mr2
* changes:
Increase the default wake lock timeout.
Ken Shirriff [Fri, 20 Nov 2009 22:35:22 +0000 (14:35 -0800)]
am
f8c2bb36: Add gservices flags for calendar sync.
Merge commit '
f8c2bb36f7b5d49553155559bc30c4e9211340e4' into eclair-mr2-plus-aosp
* commit '
f8c2bb36f7b5d49553155559bc30c4e9211340e4':
Add gservices flags for calendar sync.
Evan Millar [Fri, 20 Nov 2009 22:34:58 +0000 (14:34 -0800)]
am
288509a9: am
633177cb: Move updated 6.xml from eclair-sholes-release into eclair
Merge commit '
288509a959d437d75b1cd706431e21ccf911531f' into eclair-mr2-plus-aosp
* commit '
288509a959d437d75b1cd706431e21ccf911531f':
Move updated 6.xml from eclair-sholes-release into eclair
Dianne Hackborn [Fri, 20 Nov 2009 22:26:42 +0000 (14:26 -0800)]
Debugging for issue #
2228381 android.view.InflateException
Binary XML file line #37: Error inflating class <unknown> after adding a secondary account
Now that I have these debug logs, I want to keep them since they will make
debugging these kinds of issues a lot easier in the future. (Note in this
case there was no problem in the framework.)
Change-Id: If2b0bbeda4706b7c5dc1ba4a5db04b74f40e1543
Evan Millar [Fri, 20 Nov 2009 22:22:30 +0000 (14:22 -0800)]
am
633177cb: Move updated 6.xml from eclair-sholes-release into eclair
Merge commit '
633177cbdc21b9e8f2153069965fb6aa30b8cb8f' into eclair-mr2
* commit '
633177cbdc21b9e8f2153069965fb6aa30b8cb8f':
Move updated 6.xml from eclair-sholes-release into eclair
Vasu Nori [Fri, 20 Nov 2009 22:14:45 +0000 (14:14 -0800)]
am
5a03f36e: maintain cache of statementids returned by sqlite upon compiling a sql stmnt
Merge commit '
5a03f36ef845f73eb4473193dbb0f93dd12a51af' into eclair-mr2-plus-aosp
* commit '
5a03f36ef845f73eb4473193dbb0f93dd12a51af':
maintain cache of statementids returned by sqlite upon compiling a sql stmnt
Mike Lockwood [Fri, 20 Nov 2009 21:36:14 +0000 (13:36 -0800)]
am
53e9c126: am
a1ce6551: Merge change I69324a33 into eclair
Merge commit '
53e9c126f5fc39459554f0290a2c863f645d397a' into eclair-mr2-plus-aosp
* commit '
53e9c126f5fc39459554f0290a2c863f645d397a':
AlarmManagerService: Fix daylight savings time offset computation
Mike Lockwood [Fri, 20 Nov 2009 21:32:17 +0000 (13:32 -0800)]
am
a1ce6551: Merge change I69324a33 into eclair
Merge commit '
a1ce6551e1fd8a1ed4af58857413c0a7f701b5c2' into eclair-mr2
* commit '
a1ce6551e1fd8a1ed4af58857413c0a7f701b5c2':
AlarmManagerService: Fix daylight savings time offset computation
Android (Google) Code Review [Fri, 20 Nov 2009 21:28:12 +0000 (13:28 -0800)]
Merge change I69324a33 into eclair
* changes:
AlarmManagerService: Fix daylight savings time offset computation
Dirk Dougherty [Fri, 20 Nov 2009 21:18:25 +0000 (13:18 -0800)]
am
d47fad27: am
055b4392: Merge change I0a17a960 into eclair
Merge commit '
d47fad27d76527dfa27f6c5425cc4074f6c3a158' into eclair-mr2-plus-aosp
* commit '
d47fad27d76527dfa27f6c5425cc4074f6c3a158':
sdk doc change for esr: Add api diff report 5->6. Update previous diff reports to fix false positives.
Dirk Dougherty [Fri, 20 Nov 2009 21:13:25 +0000 (13:13 -0800)]
am
055b4392: Merge change I0a17a960 into eclair
Merge commit '
055b439289f38c5a1d3bd43c0e218a4cbb93773d' into eclair-mr2
* commit '
055b439289f38c5a1d3bd43c0e218a4cbb93773d':
sdk doc change for esr: Add api diff report 5->6. Update previous diff reports to fix false positives.
Android (Google) Code Review [Fri, 20 Nov 2009 21:08:06 +0000 (13:08 -0800)]
Merge change I0a17a960 into eclair
* changes:
sdk doc change for esr: Add api diff report 5->6. Update previous diff reports to fix false positives.
Yu Shan Emily Lau [Fri, 20 Nov 2009 20:08:54 +0000 (12:08 -0800)]
am
507322ca: am
9ed314ce: Merge change Ib3191441 into eclair
Merge commit '
507322ca5c5b678714314ae87e27d07c89c40785' into eclair-mr2-plus-aosp
* commit '
507322ca5c5b678714314ae87e27d07c89c40785':
Add the checking for mediaplayer stress test.
Yu Shan Emily Lau [Fri, 20 Nov 2009 20:03:34 +0000 (12:03 -0800)]
am
9ed314ce: Merge change Ib3191441 into eclair
Merge commit '
9ed314cefb5ec711dfcb5527a2a0a6b87a643c24' into eclair-mr2
* commit '
9ed314cefb5ec711dfcb5527a2a0a6b87a643c24':
Add the checking for mediaplayer stress test.
Android (Google) Code Review [Fri, 20 Nov 2009 19:59:28 +0000 (11:59 -0800)]
Merge change Ib3191441 into eclair
* changes:
Add the checking for mediaplayer stress test.
Scott Main [Fri, 20 Nov 2009 18:06:15 +0000 (10:06 -0800)]
am
0bbb68fe: am
2a6a149f: am
820a4e7d: docs change for ESD: add samples html pages for offline docs
Merge commit '
0bbb68fe290e1c2e4b9c5722fc2dbbd29fc4e336' into eclair-mr2-plus-aosp
* commit '
0bbb68fe290e1c2e4b9c5722fc2dbbd29fc4e336':
docs change for ESD: add samples html pages for offline docs
Scott Main [Fri, 20 Nov 2009 18:05:56 +0000 (10:05 -0800)]
am
cb596642: am
e1611399: am
6d95fc0a: docs for ESR: add docs to bluetooth explainin that discovery should be cancelled before connecting to a device
Merge commit '
cb5966426a51aeb7d02e7f859512d20e084e03ed' into eclair-mr2-plus-aosp
* commit '
cb5966426a51aeb7d02e7f859512d20e084e03ed':
docs for ESR: add docs to bluetooth explainin that discovery should
Scott Main [Fri, 20 Nov 2009 18:00:55 +0000 (10:00 -0800)]
am
2a6a149f: am
820a4e7d: docs change for ESD: add samples html pages for offline docs
Merge commit '
2a6a149fc2abfb8ef654ed36ce4524209f5e33bc' into eclair-mr2
* commit '
2a6a149fc2abfb8ef654ed36ce4524209f5e33bc':
docs change for ESD: add samples html pages for offline docs
Scott Main [Fri, 20 Nov 2009 18:00:28 +0000 (10:00 -0800)]
am
e1611399: am
6d95fc0a: docs for ESR: add docs to bluetooth explainin that discovery should be cancelled before connecting to a device
Merge commit '
e16113998bb10f39ee1384bfc497aceeeb193440' into eclair-mr2
* commit '
e16113998bb10f39ee1384bfc497aceeeb193440':
docs for ESR: add docs to bluetooth explainin that discovery should
Mike Lockwood [Fri, 20 Nov 2009 17:56:25 +0000 (09:56 -0800)]
am
401a712e: IPowerManager: remove some unused methods.
Merge commit '
401a712e3b3b41c77e79a130d7b07d653e18bcab' into eclair-mr2-plus-aosp
* commit '
401a712e3b3b41c77e79a130d7b07d653e18bcab':
IPowerManager: remove some unused methods.
Scott Main [Fri, 20 Nov 2009 17:54:52 +0000 (09:54 -0800)]
am
820a4e7d: docs change for ESD: add samples html pages for offline docs
Merge commit '
820a4e7dd6adeff162a92ca40ebe2f109561036b' into eclair
* commit '
820a4e7dd6adeff162a92ca40ebe2f109561036b':
docs change for ESD: add samples html pages for offline docs
Scott Main [Fri, 20 Nov 2009 17:54:22 +0000 (09:54 -0800)]
am
6d95fc0a: docs for ESR: add docs to bluetooth explainin that discovery should be cancelled before connecting to a device
Merge commit '
6d95fc0a2ca910212a43c4547c0ef000659b72dc' into eclair
* commit '
6d95fc0a2ca910212a43c4547c0ef000659b72dc':
docs for ESR: add docs to bluetooth explainin that discovery should
Ben Murdoch [Fri, 20 Nov 2009 11:13:15 +0000 (03:13 -0800)]
am
aa5e25d2: Re-run update-api to fix the build.
Merge commit '
aa5e25d2205fdba8663cfb7658e227658a06606c' into eclair-mr2-plus-aosp
* commit '
aa5e25d2205fdba8663cfb7658e227658a06606c':
Re-run update-api to fix the build.
Ben Murdoch [Fri, 20 Nov 2009 10:20:02 +0000 (02:20 -0800)]
am
7caaeecc: Rename WebChromeClient.addMessageToConsole to WebChromeClient.onConsoleMessage.
Merge commit '
7caaeecce1b04e2098dd4f471fdd69ebe28c31b0' into eclair-mr2-plus-aosp
* commit '
7caaeecce1b04e2098dd4f471fdd69ebe28c31b0':
Rename WebChromeClient.addMessageToConsole to WebChromeClient.onConsoleMessage.
Eric Laurent [Thu, 19 Nov 2009 17:00:56 +0000 (09:00 -0800)]
Issue
2265163: Audio still reported routed through earpiece on sholes
This is a second attempt to fix the audio routed to earpiece syndrom.
The root cause identified this time is the crash of an application having an active AudioTrack playing on the VOICE_CALL stream type.
When this happens, the AudioTrack destructor is not called and the audio policy manager is not notified of the track stop.
Results a situation where the VOICE_CALL stream is considered as always in use by audio policy manager which makes that audio is routed to earpiece.
The fix consists in moving the track start/stop/close notification to audio policiy manager from AudioTrack to AudioFlinger Track objet.
The net result is that in the case of a client application crash, the AudioFlinger TrackHandle object (which implements the remote side of the IAudioTrack binder interface) destructor is called which in turn destroys the Track object and we can notify the audio policy manager of the track stop and removal.
The same modification is made for AudioRecord although no bug related to record has been reported yet.
Also fixed a potential problem if record stop is called while the record thread is exiting.
Daisuke Miyakawa [Fri, 20 Nov 2009 07:19:32 +0000 (23:19 -0800)]
am
5e332efd: Merge change I903ce7b1 into eclair-mr2
Merge commit '
5e332efd56ffc8bcc6c40b214aca66bec21648b7' into eclair-mr2-plus-aosp
* commit '
5e332efd56ffc8bcc6c40b214aca66bec21648b7':
Fix a problem in which Android custom fields are not emitted correctly in non-Ascii languages.
Android (Google) Code Review [Fri, 20 Nov 2009 07:14:37 +0000 (23:14 -0800)]
Merge change I903ce7b1 into eclair-mr2
* changes:
Fix a problem in which Android custom fields are not emitted correctly in non-Ascii languages.
Joe Onorato [Fri, 20 Nov 2009 05:25:07 +0000 (21:25 -0800)]
am
50b69062: am
57bda83d: Merge change I4f614c9e into eclair
Merge commit '
50b690625b4dd37475d6966f9037801b2ddde5f8' into eclair-mr2-plus-aosp
* commit '
50b690625b4dd37475d6966f9037801b2ddde5f8':
Add a test app that has 100 icons. None of them do anything when clicked.
Joe Onorato [Fri, 20 Nov 2009 05:20:18 +0000 (21:20 -0800)]
am
57bda83d: Merge change I4f614c9e into eclair
Merge commit '
57bda83d105a1fc3c4c0ccb6cb743e6ba7c98870' into eclair-mr2
* commit '
57bda83d105a1fc3c4c0ccb6cb743e6ba7c98870':
Add a test app that has 100 icons. None of them do anything when clicked.
Android (Google) Code Review [Fri, 20 Nov 2009 04:17:06 +0000 (20:17 -0800)]
Merge change I4f614c9e into eclair
* changes:
Add a test app that has 100 icons. None of them do anything when clicked.
Mathias Agopian [Fri, 20 Nov 2009 03:12:01 +0000 (19:12 -0800)]
am
b439f561: am
13feccf5: Merge change I39f0003e into eclair
Merge commit '
b439f561a6aa3900f1850e71a4aa60618af13f90' into eclair-mr2-plus-aosp
* commit '
b439f561a6aa3900f1850e71a4aa60618af13f90':
fix [
2235414] libagl glDeleteBuffers() crashes
Mathias Agopian [Fri, 20 Nov 2009 03:07:36 +0000 (19:07 -0800)]
am
13feccf5: Merge change I39f0003e into eclair
Merge commit '
13feccf592d6870b41b3b8a0a31d2abefad0d7ae' into eclair-mr2
* commit '
13feccf592d6870b41b3b8a0a31d2abefad0d7ae':
fix [
2235414] libagl glDeleteBuffers() crashes
Android (Google) Code Review [Fri, 20 Nov 2009 03:03:53 +0000 (19:03 -0800)]
Merge change I39f0003e into eclair
* changes:
fix [
2235414] libagl glDeleteBuffers() crashes
Daisuke Miyakawa [Fri, 20 Nov 2009 02:54:32 +0000 (18:54 -0800)]
am
4f81eac4: Merge change I27b1bb90 into eclair-mr2
Merge commit '
4f81eac4ea57aaf9d2b89ab8b201c60ca5bf3c09' into eclair-mr2-plus-aosp
* commit '
4f81eac4ea57aaf9d2b89ab8b201c60ca5bf3c09':
Refactor vCard test code and modify unit tests.
Android (Google) Code Review [Fri, 20 Nov 2009 02:50:48 +0000 (18:50 -0800)]
Merge change I27b1bb90 into eclair-mr2
* changes:
Refactor vCard test code and modify unit tests.
Doug Zongker [Fri, 20 Nov 2009 02:23:52 +0000 (18:23 -0800)]
am
6fd4e76c: fix bad link in javadoc that\'s breaking SDK build
Merge commit '
6fd4e76ca1866772d125089e8f2e3f1d54fcae08' into eclair-mr2-plus-aosp
* commit '
6fd4e76ca1866772d125089e8f2e3f1d54fcae08':
fix bad link in javadoc that's breaking SDK build
Dianne Hackborn [Fri, 20 Nov 2009 02:23:31 +0000 (18:23 -0800)]
am
b9ab7126: am
524812fb: Merge change I7d40ad9a into eclair
Merge commit '
b9ab71263ebff601a7c5e00258d92493de85fb36' into eclair-mr2-plus-aosp
* commit '
b9ab71263ebff601a7c5e00258d92493de85fb36':
More on issue #
2271640: Fix wallpaper etc docs
Dianne Hackborn [Fri, 20 Nov 2009 02:06:06 +0000 (18:06 -0800)]
am
524812fb: Merge change I7d40ad9a into eclair
Merge commit '
524812fbf583db5053ff56f7a146fa8fe9296742' into eclair-mr2
* commit '
524812fbf583db5053ff56f7a146fa8fe9296742':
More on issue #
2271640: Fix wallpaper etc docs
Android (Google) Code Review [Fri, 20 Nov 2009 02:01:30 +0000 (18:01 -0800)]
Merge change I7d40ad9a into eclair
* changes:
More on issue #
2271640: Fix wallpaper etc docs
Mathias Agopian [Fri, 20 Nov 2009 01:32:05 +0000 (17:32 -0800)]
fix [
2235414] libagl glDeleteBuffers() crashes
don't dereference null pointers, would happen if one of the array wasn't bound.
Doug Zongker [Fri, 20 Nov 2009 01:28:42 +0000 (17:28 -0800)]
am
50a21f4d: add reboot() method to PowerManager
Merge commit '
50a21f4d3b70360b36acad20e234c380654fd59f' into eclair-mr2-plus-aosp
* commit '
50a21f4d3b70360b36acad20e234c380654fd59f':
add reboot() method to PowerManager
Mathias Agopian [Fri, 20 Nov 2009 00:34:17 +0000 (16:34 -0800)]
am
793810f6: am
23aa34a7: Merge change I137dac6f into eclair
Merge commit '
793810f68fcf1ace817f6ebcb42a6adb13c28582' into eclair-mr2-plus-aosp
* commit '
793810f68fcf1ace817f6ebcb42a6adb13c28582':
backout a workaround that is not needed anymore
Mathias Agopian [Fri, 20 Nov 2009 00:29:30 +0000 (16:29 -0800)]
am
23aa34a7: Merge change I137dac6f into eclair
Merge commit '
23aa34a743ae18e0d45b459f0c7010eb47a2147a' into eclair-mr2
* commit '
23aa34a743ae18e0d45b459f0c7010eb47a2147a':
backout a workaround that is not needed anymore
Mike Chan [Fri, 20 Nov 2009 00:29:04 +0000 (16:29 -0800)]
am
b2a51667: am
23b3ef82: Merge change I99194df1 into eclair
Merge commit '
b2a5166704ae76cc468b49710d4c967b58112359' into eclair-mr2-plus-aosp
* commit '
b2a5166704ae76cc468b49710d4c967b58112359':
frameworks: base: dumpstate: Dump kernel cpufreq speeds.
Mike Chan [Fri, 20 Nov 2009 00:23:56 +0000 (16:23 -0800)]
am
23b3ef82: Merge change I99194df1 into eclair
Merge commit '
23b3ef82c0c4175e8c953740306ee6b080dae8e7' into eclair-mr2
* commit '
23b3ef82c0c4175e8c953740306ee6b080dae8e7':
frameworks: base: dumpstate: Dump kernel cpufreq speeds.
Android (Google) Code Review [Fri, 20 Nov 2009 00:23:29 +0000 (16:23 -0800)]
Merge change I137dac6f into eclair
* changes:
backout a workaround that is not needed anymore
Android (Google) Code Review [Fri, 20 Nov 2009 00:18:51 +0000 (16:18 -0800)]
Merge change I99194df1 into eclair
* changes:
frameworks: base: dumpstate: Dump kernel cpufreq speeds.
Mathias Agopian [Thu, 19 Nov 2009 23:52:28 +0000 (15:52 -0800)]
backout a workaround that is not needed anymore
we had to add a call to glFinish() before glReadPixels() because of a bug in the GL ES
driver of a certain device. This is not needed anymore.
Mathias Agopian [Thu, 19 Nov 2009 23:51:22 +0000 (15:51 -0800)]
am
fc64165e: am
74a331b5: Merge change I4c29c948 into eclair
Merge commit '
fc64165ef7116a385ae6d9983ab077adc47a6326' into eclair-mr2-plus-aosp
* commit '
fc64165ef7116a385ae6d9983ab077adc47a6326':
fix [
2269022] The raw picture displayed post shutter seems to have low-resolution
Mathias Agopian [Thu, 19 Nov 2009 23:47:37 +0000 (15:47 -0800)]
am
74a331b5: Merge change I4c29c948 into eclair
Merge commit '
74a331b5dd1d39da44b608743c36ab3523f598d2' into eclair-mr2
* commit '
74a331b5dd1d39da44b608743c36ab3523f598d2':
fix [
2269022] The raw picture displayed post shutter seems to have low-resolution
Android (Google) Code Review [Thu, 19 Nov 2009 23:44:13 +0000 (15:44 -0800)]
Merge change I4c29c948 into eclair
* changes:
fix [
2269022] The raw picture displayed post shutter seems to have low-resolution
Andreas Huber [Thu, 19 Nov 2009 23:05:02 +0000 (15:05 -0800)]
am
57c70146: am
f854e077: (-s ours) Merge change I8134d6ed into eclair
Merge commit '
57c701463f57ea50f6116690641f376e84c4c290' into eclair-mr2-plus-aosp
* commit '
57c701463f57ea50f6116690641f376e84c4c290':
DO NOT MERGE: Instead of inserting semi-random delays after submission to surface flinger, delay releasing buffers to the next display time to avoid flickering.
Jason Sams [Thu, 19 Nov 2009 23:04:19 +0000 (15:04 -0800)]
am
d581b1a8: am
ddac83a5: Fix extended logging for object dumping.
Merge commit '
d581b1a8c6103b55d2e13318e9c35103b8689810' into eclair-mr2-plus-aosp
* commit '
d581b1a8c6103b55d2e13318e9c35103b8689810':
Fix extended logging for object dumping.
Andreas Huber [Thu, 19 Nov 2009 23:01:14 +0000 (15:01 -0800)]
am
f854e077: (-s ours) Merge change I8134d6ed into eclair
Merge commit '
f854e0770207e93ef9d1bf6d50ed18537a107ca4' into eclair-mr2
* commit '
f854e0770207e93ef9d1bf6d50ed18537a107ca4':
DO NOT MERGE: Instead of inserting semi-random delays after submission to surface flinger, delay releasing buffers to the next display time to avoid flickering.
Jason Sams [Thu, 19 Nov 2009 22:56:39 +0000 (14:56 -0800)]
am
ddac83a5: Fix extended logging for object dumping.
Merge commit '
ddac83a516e939b55f20b226365596760159c9df' into eclair-mr2
* commit '
ddac83a516e939b55f20b226365596760159c9df':
Fix extended logging for object dumping.
Android (Google) Code Review [Thu, 19 Nov 2009 22:52:57 +0000 (14:52 -0800)]
Merge change I8134d6ed into eclair
* changes:
DO NOT MERGE: Instead of inserting semi-random delays after submission to surface flinger, delay releasing buffers to the next display time to avoid flickering.
Mathias Agopian [Thu, 19 Nov 2009 22:46:26 +0000 (14:46 -0800)]
fix [
2269022] The raw picture displayed post shutter seems to have low-resolution
Make sure to always enable linear filtering in LayerBuffer. This change doesn't affect
devices using overlays.
Daisuke Miyakawa [Thu, 19 Nov 2009 22:18:11 +0000 (14:18 -0800)]
am
eb114de5: Merge change I639b0f03 into eclair-mr2
Merge commit '
eb114de5037bba89333bd7d57d305ae989727096' into eclair-mr2-plus-aosp
* commit '
eb114de5037bba89333bd7d57d305ae989727096':
Make vCard exporter append neighborhood to locality field instead of extended address,
Android (Google) Code Review [Thu, 19 Nov 2009 22:13:31 +0000 (14:13 -0800)]
Merge change I639b0f03 into eclair-mr2
* changes:
Make vCard exporter append neighborhood to locality field instead of extended address, per China convention.
Grace Kloba [Thu, 19 Nov 2009 21:51:20 +0000 (13:51 -0800)]
am
98fdda09: Merge change I86773fbb into eclair-mr2
Merge commit '
98fdda09256072ae4f45a08ee40178b3ef643c9f' into eclair-mr2-plus-aosp
* commit '
98fdda09256072ae4f45a08ee40178b3ef643c9f':
If overview width is the same as the current width,
Android (Google) Code Review [Thu, 19 Nov 2009 21:47:24 +0000 (13:47 -0800)]
Merge change I86773fbb into eclair-mr2
* changes:
If overview width is the same as the current width, don't change the mode when double tap or zoom out.
Steve Block [Thu, 19 Nov 2009 20:08:01 +0000 (12:08 -0800)]
am
57534f1b: Improves documentation for GeolocationPermissions class.
Merge commit '
57534f1b9f52cea094e8197d1ca40f0d2f68cc66' into eclair-mr2-plus-aosp
* commit '
57534f1b9f52cea094e8197d1ca40f0d2f68cc66':
Improves documentation for GeolocationPermissions class.
Fred Quintana [Thu, 19 Nov 2009 20:07:37 +0000 (12:07 -0800)]
am
f61ab007: am
5994cd28: -hide AccountManagerResponse, which never should have been exposed in the first place
Merge commit '
f61ab00770c6010d83280644263d6f530c75028e' into eclair-mr2-plus-aosp
* commit '
f61ab00770c6010d83280644263d6f530c75028e':
-hide AccountManagerResponse, which never should have been exposed in the first place
Dianne Hackborn [Thu, 19 Nov 2009 20:07:13 +0000 (12:07 -0800)]
Fred Quintana [Thu, 19 Nov 2009 19:41:48 +0000 (11:41 -0800)]
am
5994cd28: -hide AccountManagerResponse, which never should have been exposed in the first place
Merge commit '
5994cd2898ad3c76d1f5068137a884024f521163' into eclair-mr2
* commit '
5994cd2898ad3c76d1f5068137a884024f521163':
-hide AccountManagerResponse, which never should have been exposed in the first place
lknguyen [Thu, 19 Nov 2009 19:41:35 +0000 (11:41 -0800)]
am
8250530c: Merge change I194f0808 into eclair-mr2
Merge commit '
8250530c507653d57c768677d8a542cd769aaf99' into eclair-mr2-plus-aosp
* commit '
8250530c507653d57c768677d8a542cd769aaf99':
Add Gservices flag so that Market can turn on performance logging for specific groups.
Dianne Hackborn [Thu, 19 Nov 2009 19:40:48 +0000 (11:40 -0800)]
Android (Google) Code Review [Thu, 19 Nov 2009 19:36:42 +0000 (11:36 -0800)]
Merge change I194f0808 into eclair-mr2
* changes:
Add Gservices flag so that Market can turn on performance logging for specific groups.
Dianne Hackborn [Thu, 19 Nov 2009 19:14:34 +0000 (11:14 -0800)]
am
2b38a09f: am
23ef7b48: Fix most of issue #
2271640: Fix wallpaper etc docs
Merge commit '
2b38a09f044ad0bb14db7360b352fcca612f49ac' into eclair-mr2-plus-aosp
* commit '
2b38a09f044ad0bb14db7360b352fcca612f49ac':
Fix most of issue #
2271640: Fix wallpaper etc docs
Dianne Hackborn [Thu, 19 Nov 2009 19:09:11 +0000 (11:09 -0800)]
am
23ef7b48: Fix most of issue #
2271640: Fix wallpaper etc docs
Merge commit '
23ef7b4836d66d31430fedee2aac36275bb30d4b' into eclair-mr2
* commit '
23ef7b4836d66d31430fedee2aac36275bb30d4b':
Fix most of issue #
2271640: Fix wallpaper etc docs
Ben Murdoch [Thu, 19 Nov 2009 17:11:48 +0000 (09:11 -0800)]
am
b0fbb7cc: Merge change I09e159ce into eclair-mr2
Merge commit '
b0fbb7cc15a2b383b4fe1dde8117254b2056573b' into eclair-mr2-plus-aosp
* commit '
b0fbb7cc15a2b383b4fe1dde8117254b2056573b':
Update JavaDoc for CacheManger.CacheResult, WebChromeClient.getDefaultVideoPoster and WebChromeClient.getVideoLoadingProgressView.
Android (Google) Code Review [Thu, 19 Nov 2009 17:08:22 +0000 (09:08 -0800)]
Merge change I09e159ce into eclair-mr2
* changes:
Update JavaDoc for CacheManger.CacheResult, WebChromeClient.getDefaultVideoPoster and WebChromeClient.getVideoLoadingProgressView.
Ben Murdoch [Thu, 19 Nov 2009 13:00:12 +0000 (05:00 -0800)]
am
0a784a54: When requesting the href of a link, also request the link\'s text.
Merge commit '
0a784a545303cc5fcd9ecbc260d1fa0d0d0b8336' into eclair-mr2-plus-aosp
* commit '
0a784a545303cc5fcd9ecbc260d1fa0d0d0b8336':
When requesting the href of a link, also request the link's text.
Daisuke Miyakawa [Thu, 19 Nov 2009 02:26:24 +0000 (18:26 -0800)]
am
6a942dbe: Merge change Ifd754059 into eclair-mr2
Merge commit '
6a942dbe51b52ce41903e236d5db294274bb0dd2' into eclair-mr2-plus-aosp
* commit '
6a942dbe51b52ce41903e236d5db294274bb0dd2':
Make vCard code refrain from using NEIGHBORHOOD field when importing.
Android (Google) Code Review [Thu, 19 Nov 2009 02:23:21 +0000 (18:23 -0800)]
Merge change Ifd754059 into eclair-mr2
* changes:
Make vCard code refrain from using NEIGHBORHOOD field when importing.
Dan Egnor [Thu, 19 Nov 2009 01:55:50 +0000 (17:55 -0800)]
am
b99c469e: Merge change I3a62e1c2 into eclair-mr2
Merge commit '
b99c469e2bb96420ee3c57b351aa23dd4322852a' into eclair-mr2-plus-aosp
* commit '
b99c469e2bb96420ee3c57b351aa23dd4322852a':
Solve the mutual interdependency problem between common and framework:
Scott Main [Thu, 19 Nov 2009 01:55:27 +0000 (17:55 -0800)]
am
9d6704f9: am
d2a9f54f: am
afcd516e: Merge change Iaae72f66 into eclair-sdk
Merge commit '
9d6704f9f1d078f066fb8f5568179fd0743de406' into eclair-mr2-plus-aosp
* commit '
9d6704f9f1d078f066fb8f5568179fd0743de406':
docs: misc edits to samples page and intro docs
Jean-Michel Trivi [Thu, 19 Nov 2009 01:32:25 +0000 (17:32 -0800)]
am
4eaf35b9: am
a0e37e9d: Merge change I941136fd into eclair
Merge commit '
4eaf35b99deb2abbb350383dd6458f1ea12e5bee' into eclair-mr2-plus-aosp
* commit '
4eaf35b99deb2abbb350383dd6458f1ea12e5bee':
Fix bug
2271468 Update the javadoc for MediaRecorder.AudioSource
Android (Google) Code Review [Thu, 19 Nov 2009 01:23:19 +0000 (17:23 -0800)]
Merge change I3a62e1c2 into eclair-mr2
* changes:
Solve the mutual interdependency problem between common and framework: Have framework include the common source files directly when building, then build common as a static library separately (depending on framework, like everything else).
Scott Main [Thu, 19 Nov 2009 01:18:16 +0000 (17:18 -0800)]
am
d2a9f54f: am
afcd516e: Merge change Iaae72f66 into eclair-sdk
Merge commit '
d2a9f54f9ec997562623091d404e0208fd9ce5f8' into eclair-mr2
* commit '
d2a9f54f9ec997562623091d404e0208fd9ce5f8':
docs: misc edits to samples page and intro docs
repo sync [Thu, 19 Nov 2009 01:12:50 +0000 (20:12 -0500)]
resolved conflicts for merge of
efd91d7c to eclair-mr2-plus-aosp
Signed-off-by: repo sync <lockwood@android.com>