OSDN Git Service
Fred Quintana [Wed, 7 Oct 2009 05:55:12 +0000 (22:55 -0700)]
am
f038004f: changes from Sync Manager API Review: bug
2164262
Merge commit '
f038004f4a5e4fab18df9c87573ba1e82790c30f' into eclair-mr2
* commit '
f038004f4a5e4fab18df9c87573ba1e82790c30f':
changes from Sync Manager API Review: bug
2164262
Mathias Agopian [Wed, 7 Oct 2009 05:34:21 +0000 (22:34 -0700)]
am
460b60c9: Revert "temporarily disable the use of glTexImage2D for sw buffers on sholes."
Merge commit '
460b60c9b064ef02e9eaf56ecf2f266fd7c4089c' into eclair-mr2
* commit '
460b60c9b064ef02e9eaf56ecf2f266fd7c4089c':
Revert "temporarily disable the use of glTexImage2D for sw buffers on sholes."
Mathias Agopian [Wed, 7 Oct 2009 05:23:23 +0000 (22:23 -0700)]
Revert "temporarily disable the use of glTexImage2D for sw buffers on sholes."
This reverts commit
c131c5671965b69b0dee3e4afa3b3dd5e3c0c405.
Approved by Hiroshi
Brett Chabot [Wed, 7 Oct 2009 02:42:08 +0000 (19:42 -0700)]
am
773fd131: Merge change I3429f77a into eclair
Merge commit '
773fd13130948397cac5178e16d17975a06a738b' into eclair-mr2
* commit '
773fd13130948397cac5178e16d17975a06a738b':
Suppress flaky test HeapTest#testOomeLarge.
Android (Google) Code Review [Wed, 7 Oct 2009 02:35:27 +0000 (22:35 -0400)]
Merge change I3429f77a into eclair
* changes:
Suppress flaky test HeapTest#testOomeLarge.
Mathias Agopian [Wed, 7 Oct 2009 02:18:06 +0000 (19:18 -0700)]
am
26fe45dc: Merge change I4961c959 into eclair
Merge commit '
26fe45dcb3df12eda94d93f1473cd6a2f5f345c7' into eclair-mr2
* commit '
26fe45dcb3df12eda94d93f1473cd6a2f5f345c7':
fix [
2152536] ANR in browser
Eric Laurent [Wed, 7 Oct 2009 02:18:00 +0000 (19:18 -0700)]
am
62443f5f: Fix issue
2139634: DTMF tones on Sholes popping, hissing (audio latency too high).
Merge commit '
62443f5f4517ba17d911975e695f1ab75bfdbf77' into eclair-mr2
* commit '
62443f5f4517ba17d911975e695f1ab75bfdbf77':
Fix issue
2139634: DTMF tones on Sholes popping, hissing (audio latency too high).
Romain Guy [Wed, 7 Oct 2009 02:17:55 +0000 (19:17 -0700)]
am
c404ed2b: Fix failing unit test; the test was using a deprecated API making it fail on WVGA devices.
Merge commit '
c404ed2be5d29c8932a3d69b53fea4653c9b868b' into eclair-mr2
* commit '
c404ed2be5d29c8932a3d69b53fea4653c9b868b':
Fix failing unit test; the test was using a deprecated API making it fail on WVGA devices.
Mathias Agopian [Wed, 7 Oct 2009 02:17:49 +0000 (19:17 -0700)]
am
c131c567: temporarily disable the use of glTexImage2D for sw buffers on sholes.
Merge commit '
c131c5671965b69b0dee3e4afa3b3dd5e3c0c405' into eclair-mr2
* commit '
c131c5671965b69b0dee3e4afa3b3dd5e3c0c405':
temporarily disable the use of glTexImage2D for sw buffers on sholes.
Mathias Agopian [Wed, 7 Oct 2009 02:17:44 +0000 (19:17 -0700)]
am
9d6a685b: Merge changes I430cf57b,I51f02f67,I464f13f3 into eclair
Merge commit '
9d6a685ba939f413a8d3e1e97627593aa1cdf6cb' into eclair-mr2
* commit '
9d6a685ba939f413a8d3e1e97627593aa1cdf6cb':
fix [
2168528] enable glTexImage2D code path in SF for software-only buffers
fix [
2168531] have software-only gralloc buffer side-step the HAL
fix [
2167050] glTexImage2D code path buggy in SurfaceFlinger
Jason Sams [Wed, 7 Oct 2009 02:17:38 +0000 (19:17 -0700)]
am
fe7c2a50: Merge change I996db8da into eclair
Merge commit '
fe7c2a50148ac9f0d6fbe0030fc53f457c10870a' into eclair-mr2
* commit '
fe7c2a50148ac9f0d6fbe0030fc53f457c10870a':
Fix tls crash on startup if more than one RS contexts are created in one process.
Android (Google) Code Review [Wed, 7 Oct 2009 02:10:17 +0000 (22:10 -0400)]
Merge change I4961c959 into eclair
* changes:
fix [
2152536] ANR in browser
Mathias Agopian [Wed, 7 Oct 2009 02:00:57 +0000 (19:00 -0700)]
fix [
2152536] ANR in browser
A window is created and the browser is about to render into it the
very first time, at that point it does an IPC to SF to request a new
buffer. Meanwhile, the window manager removes that window from the
list and the shared memory block it uses is marked as invalid.
However, at that point, another window is created and is given the
same index (that just go freed), but a different identity and resets
the "invalid" bit in the shared block. When we go back to the buffer
allocation code, we're stuck because the surface we're allocating for
is gone and we don't detect it's invalid because the invalid bit has
been reset.
It is not sufficient to check for the invalid bit, I should
also check that identities match.
Eric Laurent [Tue, 6 Oct 2009 03:29:18 +0000 (20:29 -0700)]
Fix issue
2139634: DTMF tones on Sholes popping, hissing (audio latency too high).
This change is a complement to the main fix in kernel driver for the same issue (partner change #1250).
It removes clicks sometimes heard after the end of the tones while audio flinger is sending 0s to the audio output stream.
The problem was that the sleep time between two writes was more than the duration of one audio output stream buffer which could cause some underrun.
Also fixed a recent regression in ToneGenerator that made that the end of previous tone was repeated at the beginning of current one under certain timing circumstances when the maximum tone duration was specified.
Mathias Agopian [Wed, 7 Oct 2009 00:59:43 +0000 (17:59 -0700)]
temporarily disable the use of glTexImage2D for sw buffers on sholes.
we're going to first cut a build without this change.
Approved by Dr. Hiroshi.
Android (Google) Code Review [Wed, 7 Oct 2009 00:46:37 +0000 (20:46 -0400)]
Merge changes I430cf57b,I51f02f67,I464f13f3 into eclair
* changes:
fix [
2168528] enable glTexImage2D code path in SF for software-only buffers
fix [
2168531] have software-only gralloc buffer side-step the HAL
fix [
2167050] glTexImage2D code path buggy in SurfaceFlinger
Mathias Agopian [Tue, 6 Oct 2009 01:20:39 +0000 (18:20 -0700)]
fix [
2168528] enable glTexImage2D code path in SF for software-only buffers
Android (Google) Code Review [Wed, 7 Oct 2009 00:18:40 +0000 (20:18 -0400)]
Merge change I996db8da into eclair
* changes:
Fix tls crash on startup if more than one RS contexts are created in one process.
Mathias Agopian [Tue, 6 Oct 2009 01:19:57 +0000 (18:19 -0700)]
fix [
2168531] have software-only gralloc buffer side-step the HAL
Mathias Agopian [Tue, 6 Oct 2009 00:07:12 +0000 (17:07 -0700)]
fix [
2167050] glTexImage2D code path buggy in SurfaceFlinger
When EGLImage extension is not available, SurfaceFlinger will fallback to using
glTexImage2D and glTexSubImage2D instead, which requires 50% more memory and an
extra copy. However this code path has never been exercised and had some bugs
which this patch fix.
Mainly the scale factor wasn't computed right when falling back on glDrawElements.
We also fallback to this mode of operation if a buffer doesn't have the adequate
usage bits for EGLImage usage.
This changes only code that is currently not executed. Some refactoring was needed to
keep the change clean. This doesn't change anything functionaly.
Android (Google) Code Review [Tue, 6 Oct 2009 23:32:25 +0000 (19:32 -0400)]
Merge change I6b51a98a into eclair-mr2
* changes:
Fixed issue #4098: Ringtone#getTitle does not close its cursor.
gwang@google.com [Tue, 6 Oct 2009 22:40:42 +0000 (15:40 -0700)]
am
521f4f3a: Merge change I3d6cf8aa into eclair
Merge commit '
521f4f3af94e3a093a37af887d3e317a526b61a1' into eclair-mr2
* commit '
521f4f3af94e3a093a37af887d3e317a526b61a1':
Fix for bug
2158794. Hide MediaPlayer.invoke() and MediaPlayer.newRequest(), and Fix bad links in ToneGenerator documentation.
Xavier Ducrohet [Tue, 6 Oct 2009 22:40:37 +0000 (15:40 -0700)]
am
5f9d4bae: layout lib tests cleanup
Merge commit '
5f9d4bae03b2dfa9c1e43a6e01cacaa5a5326690' into eclair-mr2
* commit '
5f9d4bae03b2dfa9c1e43a6e01cacaa5a5326690':
layout lib tests cleanup
Xavier Ducrohet [Tue, 6 Oct 2009 22:40:32 +0000 (15:40 -0700)]
am
0a9d46b7: Add a test to make sure the replaced classes in layoutlib are correct.
Merge commit '
0a9d46b7e741ccf7272bb69a4eef3c1f2adc91b7' into eclair-mr2
* commit '
0a9d46b7e741ccf7272bb69a4eef3c1f2adc91b7':
Add a test to make sure the replaced classes in layoutlib are correct.
Robert Greenwalt [Tue, 6 Oct 2009 22:40:27 +0000 (15:40 -0700)]
am
92b5caa4: Merge change Id8df149c into eclair
Merge commit '
92b5caa4e21d48db6efeddba532d1546c6e686b1' into eclair-mr2
* commit '
92b5caa4e21d48db6efeddba532d1546c6e686b1':
Turn some logging back on in ConnectionManager
Android (Google) Code Review [Tue, 6 Oct 2009 22:34:40 +0000 (18:34 -0400)]
Merge change I3d6cf8aa into eclair
* changes:
Fix for bug
2158794. Hide MediaPlayer.invoke() and MediaPlayer.newRequest(), and Fix bad links in ToneGenerator documentation.
Android (Google) Code Review [Tue, 6 Oct 2009 21:38:03 +0000 (17:38 -0400)]
Merge change Id8df149c into eclair
* changes:
Turn some logging back on in ConnectionManager
Jim Miller [Tue, 6 Oct 2009 21:37:04 +0000 (14:37 -0700)]
am
f65161f1: Merge change If933b13d into eclair
Merge commit '
f65161f159db3d140c62f56d43e732c332af7773' into eclair-mr2
* commit '
f65161f159db3d140c62f56d43e732c332af7773':
Fix for
2161835: Tweaks to rotary lock screen:
Jason Sams [Tue, 6 Oct 2009 21:36:59 +0000 (14:36 -0700)]
am
968a9571: Merge change I516c3191 into eclair
Merge commit '
968a9571a391a2dbb0512c4fb99d04ab50861753' into eclair-mr2
* commit '
968a9571a391a2dbb0512c4fb99d04ab50861753':
Implement data push from scripts. Fixes the problem where apps would have to poll to monitor a scripts state.
Android (Google) Code Review [Tue, 6 Oct 2009 21:34:17 +0000 (17:34 -0400)]
Merge change If933b13d into eclair
* changes:
Fix for
2161835: Tweaks to rotary lock screen:
Android (Google) Code Review [Tue, 6 Oct 2009 21:32:13 +0000 (17:32 -0400)]
Merge change I516c3191 into eclair
* changes:
Implement data push from scripts. Fixes the problem where apps would have to poll to monitor a scripts state. Fix bug in StoreState where state could be overridden by the default unless the script used more than one state.
Wu-cheng Li [Tue, 6 Oct 2009 20:37:57 +0000 (13:37 -0700)]
am
962f2536: Merge change I547cff66 into eclair
Merge commit '
962f253665e0c5cc8a29de9e59ce3992dad02440' into eclair-mr2
* commit '
962f253665e0c5cc8a29de9e59ce3992dad02440':
Add zoom functions and sendCommand.
Fred Quintana [Tue, 6 Oct 2009 20:37:52 +0000 (13:37 -0700)]
Android (Google) Code Review [Tue, 6 Oct 2009 20:32:44 +0000 (16:32 -0400)]
Merge change I547cff66 into eclair
* changes:
Add zoom functions and sendCommand.
Wu-cheng Li [Mon, 28 Sep 2009 23:14:58 +0000 (16:14 -0700)]
Add zoom functions and sendCommand.
b2060030
Fred Quintana [Tue, 6 Oct 2009 19:04:41 +0000 (12:04 -0700)]
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 '
5bba632d877c2878384ff21566c8eb6a1a22f37b' into eclair-mr2
* commit '
5bba632d877c2878384ff21566c8eb6a1a22f37b':
- hide Entity and all its references
Suchi Amalapurapu [Tue, 6 Oct 2009 18:48:00 +0000 (11:48 -0700)]
am
5163cd6d: Merge change I5be3d603 into eclair
Merge commit '
5163cd6d1cb664977eb4473b98657c7e92ae430e' into eclair-mr2
* commit '
5163cd6d1cb664977eb4473b98657c7e92ae430e':
Make sdk version and code names static finals in PackageParser.
Android (Google) Code Review [Tue, 6 Oct 2009 18:36:43 +0000 (14:36 -0400)]
Merge change I5be3d603 into eclair
* changes:
Make sdk version and code names static finals in PackageParser. Remove api to set these values. Remove an unused method in AppSecurityPermissions
Daisuke Miyakawa [Tue, 6 Oct 2009 17:53:52 +0000 (10:53 -0700)]
am
ccc214b2: Merge change I6a0b14bd into eclair
Merge commit '
ccc214b21edaaddf46960388ec4d3e3ca89a01ae' into eclair-mr2
* commit '
ccc214b21edaaddf46960388ec4d3e3ca89a01ae':
Make VCardComposer create the instance for mHandlerList.
Android (Google) Code Review [Tue, 6 Oct 2009 17:48:11 +0000 (13:48 -0400)]
Merge change I6a0b14bd into eclair
* changes:
Make VCardComposer create the instance for mHandlerList.
Evan Millar [Tue, 6 Oct 2009 17:22:31 +0000 (10:22 -0700)]
am
9c3c276a: Merge change I8333dcc4 into eclair
Merge commit '
9c3c276afa7e2485e1a9f47e29ada8cb61b7b07c' into eclair-mr2
* commit '
9c3c276afa7e2485e1a9f47e29ada8cb61b7b07c':
New section header and divider assets.
Android (Google) Code Review [Tue, 6 Oct 2009 17:14:45 +0000 (13:14 -0400)]
Merge change I8333dcc4 into eclair
* changes:
New section header and divider assets.
Bjorn Bringert [Tue, 6 Oct 2009 16:56:23 +0000 (09:56 -0700)]
am
030b2cf1: Merge change I76d7ba61 into eclair
Merge commit '
030b2cf1eaab25890aa97e7e2a660ff5998e8639' into eclair-mr2
* commit '
030b2cf1eaab25890aa97e7e2a660ff5998e8639':
Pixel tweak search dialog to match search widget
Xavier Ducrohet [Tue, 6 Oct 2009 16:56:19 +0000 (09:56 -0700)]
am
841a8eea: Merge change I24895c35 into eclair
Merge commit '
841a8eea78479ad8a3c10e69a788adbeaef5a53d' into eclair-mr2
* commit '
841a8eea78479ad8a3c10e69a788adbeaef5a53d':
Reimplement all the method of Paint for layoutlib
Marco Nelissen [Tue, 6 Oct 2009 16:56:14 +0000 (09:56 -0700)]
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 about 45kb.
Merge commit '
c39d2e3c012fb96999991e30659a474f9f30f789' into eclair-mr2
* commit '
c39d2e3c012fb96999991e30659a474f9f30f789':
Music visualizer support hack.
Android (Google) Code Review [Tue, 6 Oct 2009 16:49:51 +0000 (12:49 -0400)]
Merge change I76d7ba61 into eclair
* changes:
Pixel tweak search dialog to match search widget
Android (Google) Code Review [Tue, 6 Oct 2009 16:49:01 +0000 (12:49 -0400)]
Merge change I24895c35 into eclair
* changes:
Reimplement all the method of Paint for layoutlib
Nick Pelly [Tue, 6 Oct 2009 14:21:35 +0000 (07:21 -0700)]
Nick Pelly [Tue, 6 Oct 2009 13:10:28 +0000 (06:10 -0700)]
am
24bb9b8a: Provide an API for apps to use a dynamic RFCOMM channel and SDP record.
Merge commit '
24bb9b8af4ff691538fe9e517e8156016b0da6cd' into eclair-mr2
* commit '
24bb9b8af4ff691538fe9e517e8156016b0da6cd':
Provide an API for apps to use a dynamic RFCOMM channel and SDP record.
Mike Lockwood [Tue, 6 Oct 2009 04:17:03 +0000 (21:17 -0700)]
am
7fdd67d3: Merge change I5b650a61 into eclair
Merge commit '
7fdd67d3867ecbb6457a560b2428a8e9464d8ecd' into eclair-mr2
* commit '
7fdd67d3867ecbb6457a560b2428a8e9464d8ecd':
dumpstate: Emit a logcat message at beginning and end of execution.
Android (Google) Code Review [Tue, 6 Oct 2009 04:09:07 +0000 (00:09 -0400)]
Merge change I5b650a61 into eclair
* changes:
dumpstate: Emit a logcat message at beginning and end of execution.
Tammo Spalink [Tue, 6 Oct 2009 02:28:37 +0000 (19:28 -0700)]
am
5c8dba21: Merge change I61aac7b3 into eclair
Merge commit '
5c8dba21bf5e6a54f848c2e7f46dc86c27a09102' into eclair-mr2
* commit '
5c8dba21bf5e6a54f848c2e7f46dc86c27a09102':
Add PERIOD char to CDMA address sugar list.
Android (Google) Code Review [Tue, 6 Oct 2009 02:19:46 +0000 (22:19 -0400)]
Merge change I61aac7b3 into eclair
* changes:
Add PERIOD char to CDMA address sugar list.
Fred Quintana [Tue, 6 Oct 2009 00:27:31 +0000 (17:27 -0700)]
am
5fbaefc3: Merge change I4db3a5b3 into eclair
Merge commit '
5fbaefc3d8840aac12b16458347b3c1ddbdaf542' into eclair-mr2
* commit '
5fbaefc3d8840aac12b16458347b3c1ddbdaf542':
fix a javadoc build breakage
Android (Google) Code Review [Tue, 6 Oct 2009 00:22:27 +0000 (20:22 -0400)]
Merge change I4db3a5b3 into eclair
* changes:
fix a javadoc build breakage
Xavier Ducrohet [Mon, 5 Oct 2009 23:03:44 +0000 (16:03 -0700)]
am
a970bf52: Merge change I34f51342 into eclair
Merge commit '
a970bf52581667e88d82e0801e0774d7c9cdcb8f' into eclair-mr2
* commit '
a970bf52581667e88d82e0801e0774d7c9cdcb8f':
Fix the layoutlib test to run from adt-tests.
Android (Google) Code Review [Mon, 5 Oct 2009 22:58:36 +0000 (18:58 -0400)]
Merge change I34f51342 into eclair
* changes:
Fix the layoutlib test to run from adt-tests.
Dianne Hackborn [Mon, 5 Oct 2009 22:58:13 +0000 (15:58 -0700)]
am
68d881cf: Fix issue #
2166755: BroadcastReceiver trying to return result during a non-ordered broadcast
Merge commit '
68d881cf2d2b252f6f795cd64d43e316a1d736e5' into eclair-mr2
* commit '
68d881cf2d2b252f6f795cd64d43e316a1d736e5':
Fix issue #
2166755: BroadcastReceiver trying to return result during a non-ordered broadcast
Xavier Ducrohet [Mon, 5 Oct 2009 22:58:08 +0000 (15:58 -0700)]
am
71060f29: Merge change I8874a405 into eclair
Merge commit '
71060f29855745893c122e8b93cf7a723186931b' into eclair-mr2
* commit '
71060f29855745893c122e8b93cf7a723186931b':
Refactor class/method names used by layoutlib_create.
Android (Google) Code Review [Mon, 5 Oct 2009 22:37:36 +0000 (18:37 -0400)]
Merge change I8874a405 into eclair
* changes:
Refactor class/method names used by layoutlib_create.
Romain Guy [Mon, 5 Oct 2009 22:37:04 +0000 (15:37 -0700)]
am
89c76843: Merge change I9b771df3 into eclair
Merge commit '
89c768435fc48a93c0af97f9f08e57a346b0a9fd' into eclair-mr2
* commit '
89c768435fc48a93c0af97f9f08e57a346b0a9fd':
Make sure AsyncTask sens a null result to onPostExecute() when cancelled.
Android (Google) Code Review [Mon, 5 Oct 2009 22:28:26 +0000 (18:28 -0400)]
Merge change I9b771df3 into eclair
* changes:
Make sure AsyncTask sens a null result to onPostExecute() when cancelled.
Fred Quintana [Mon, 5 Oct 2009 21:29:43 +0000 (14:29 -0700)]
am
24f32b32: Merge change I89c40f50 into eclair
Merge commit '
24f32b32f96eab8645a3ccf429c3d5694d2134ad' into eclair-mr2
* commit '
24f32b32f96eab8645a3ccf429c3d5694d2134ad':
fix a javadoc build breakage
Android (Google) Code Review [Mon, 5 Oct 2009 21:23:13 +0000 (17:23 -0400)]
Merge change I89c40f50 into eclair
* changes:
fix a javadoc build breakage
Android (Google) Code Review [Mon, 5 Oct 2009 20:56:37 +0000 (16:56 -0400)]
Merge change Ifb63d236 into eclair-mr2
* changes:
Add cancel() VCardDataBuilder, which is intended to remove a false alerm "Nested VCard code is not supported now." when importing vCard 3.0 file.
Bjorn Bringert [Mon, 5 Oct 2009 20:20:31 +0000 (13:20 -0700)]
am
9e4c8561: Merge change I8d48149c into eclair
Merge commit '
9e4c85614c861f095131ffa76e65cbba55d03d0a' into eclair-mr2
* commit '
9e4c85614c861f095131ffa76e65cbba55d03d0a':
Don't reinflate search bar when dialog is already showing
Android (Google) Code Review [Mon, 5 Oct 2009 20:15:14 +0000 (16:15 -0400)]
Merge change I8d48149c into eclair
* changes:
Don't reinflate search bar when dialog is already showing
Dianne Hackborn [Mon, 5 Oct 2009 19:58:24 +0000 (12:58 -0700)]
am
9830a4ac: Fix issue #
2161169: onStop not being called.
Merge commit '
9830a4ac42c9e16db91d1de6120cc2eb613fc946' into eclair-mr2
* commit '
9830a4ac42c9e16db91d1de6120cc2eb613fc946':
Fix issue #
2161169: onStop not being called.
Android (Google) Code Review [Mon, 5 Oct 2009 18:49:38 +0000 (14:49 -0400)]
Merge change I5101c2b1 into eclair-mr2
* changes:
Extend the date time to handle the case where the month is in the full name.
Fred Quintana [Mon, 5 Oct 2009 18:34:43 +0000 (11:34 -0700)]
am
f7ae77cd: account manager api review changes
Merge commit '
f7ae77cd67f1a3993b8e56c1af4720a7adf4e69d' into eclair-mr2
* commit '
f7ae77cd67f1a3993b8e56c1af4720a7adf4e69d':
account manager api review changes
Dianne Hackborn [Sun, 4 Oct 2009 22:41:35 +0000 (15:41 -0700)]
am
48e6725c: Merge change Iaca22686 into eclair
Merge commit '
48e6725c828a8d420d43925b0c9a9a915a8c4e2f' into eclair-mr2
* commit '
48e6725c828a8d420d43925b0c9a9a915a8c4e2f':
Work on issue #
2163789: Way too much logging
Android (Google) Code Review [Sun, 4 Oct 2009 22:35:24 +0000 (18:35 -0400)]
Merge change Iaca22686 into eclair
* changes:
Work on issue #
2163789: Way too much logging
Dianne Hackborn [Sun, 4 Oct 2009 22:27:09 +0000 (15:27 -0700)]
am
cbc52b7b: Merge change Iee638412 into eclair
Merge commit '
cbc52b7bcbea7dc6ae3b7cfc84fd44ae86711910' into eclair-mr2
* commit '
cbc52b7bcbea7dc6ae3b7cfc84fd44ae86711910':
Fix issue #
2161726: Car dock app bypasses setup wizard
Scott Main [Sun, 4 Oct 2009 22:27:00 +0000 (15:27 -0700)]
am
87d5004d: am
e9e1cdd5: decode the search string before putting it into the search control. this fixes a safari-only bug in which encoded chars were inserted into the search string.
Merge commit '
87d5004d3b62441a55b2aba870e4276af6c771eb' into eclair-mr2
* commit '
87d5004d3b62441a55b2aba870e4276af6c771eb':
decode the search string before putting it into the search control.
Mike Lockwood [Sun, 4 Oct 2009 22:22:08 +0000 (15:22 -0700)]
am
2ecf3f5e: dumpstate: Add backlight information to bugreport output.
Merge commit '
2ecf3f5e00ea2ac630ffb405baba33113596cf38' into eclair-mr2
* commit '
2ecf3f5e00ea2ac630ffb405baba33113596cf38':
dumpstate: Add backlight information to bugreport output.
Mathias Agopian [Sun, 4 Oct 2009 22:21:34 +0000 (15:21 -0700)]
am
f8e4bc9f: Merge change I0c4cec7e into eclair
Merge commit '
f8e4bc9f7789b98b54fe04df56555ca8c630df70' into eclair-mr2
* commit '
f8e4bc9f7789b98b54fe04df56555ca8c630df70':
Attempt to fix [
2152536] ANR in browser
Jason Sams [Sun, 4 Oct 2009 22:21:04 +0000 (15:21 -0700)]
am
8df16d63: Merge change I7f047786 into eclair
Merge commit '
8df16d63d4e1c70cf75a9acc4f24e4e1abca5abc' into eclair-mr2
* commit '
8df16d63d4e1c70cf75a9acc4f24e4e1abca5abc':
Update the SimpleMesh API to support new attribute types. Also spilt add/set commands to avoid permutation explosion.
Dmitri Plotnikov [Sun, 4 Oct 2009 22:20:26 +0000 (15:20 -0700)]
am
82e863d8: Merge change Ic0d82ef1 into eclair
Merge commit '
82e863d8ab5166fec3dce96ae865d1e2d3bbc021' into eclair-mr2
* commit '
82e863d8ab5166fec3dce96ae865d1e2d3bbc021':
[Issue
2161366] Changing capitalization of string "Via" to "via"
Android (Google) Code Review [Sun, 4 Oct 2009 22:19:29 +0000 (18:19 -0400)]
Merge change Iee638412 into eclair
* changes:
Fix issue #
2161726: Car dock app bypasses setup wizard
San Mehat [Sun, 4 Oct 2009 22:19:27 +0000 (15:19 -0700)]
am
7b16834a: Merge change Iaf686344 into eclair
Merge commit '
7b16834adc1003f492cd2be4b1bcc3fb73a78c23' into eclair-mr2
* commit '
7b16834adc1003f492cd2be4b1bcc3fb73a78c23':
dumpstate: Display mtime instead of ctime
Wei Huang [Sun, 4 Oct 2009 22:19:08 +0000 (15:19 -0700)]
am
6b370745: bug
2161715: add the .jpg extension to the temp sdcard image file name so MMS can read the JPEG data using a file uri.
Merge commit '
6b3707452c5921c89258371eec140b0fb76766f8' into eclair-mr2
* commit '
6b3707452c5921c89258371eec140b0fb76766f8':
bug
2161715: add the .jpg extension to the temp sdcard image file name so MMS can read the JPEG data using a file uri.
Mike Cleron [Sun, 4 Oct 2009 22:17:27 +0000 (15:17 -0700)]
am
df64cb41: Merge change I80ce8833 into eclair
Merge commit '
df64cb41fb44d56957cba8e375788d98af7bd8b4' into eclair-mr2
* commit '
df64cb41fb44d56957cba8e375788d98af7bd8b4':
Icons again
David Brown [Sun, 4 Oct 2009 22:17:18 +0000 (15:17 -0700)]
am
88e03757: RotarySelector widget: add callback for "grabbed" state changes.
Merge commit '
88e037577f7db140e4ef88b77eefaa910e06e5f5' into eclair-mr2
* commit '
88e037577f7db140e4ef88b77eefaa910e06e5f5':
RotarySelector widget: add callback for "grabbed" state changes.
Eric Fischer [Sun, 4 Oct 2009 22:16:07 +0000 (15:16 -0700)]
am
3d7bb3a5: (-s ours) Merge change I3ca8fb69 into eclair
Merge commit '
3d7bb3a5e49b559725bba84390b1021d9c527347' into eclair-mr2
* commit '
3d7bb3a5e49b559725bba84390b1021d9c527347':
Import revised translations. DO NOT MERGE
Jaikumar Ganesh [Sun, 4 Oct 2009 22:14:55 +0000 (15:14 -0700)]
am
d453fe67: Merge change I5dbd1994 into eclair
Merge commit '
d453fe6709c4d28350e34fa39b4fe73d98a36a0c' into eclair-mr2
* commit '
d453fe6709c4d28350e34fa39b4fe73d98a36a0c':
Fix rfcomm socket connect return code.
Mathias Agopian [Sun, 4 Oct 2009 22:14:32 +0000 (15:14 -0700)]
am
4ac45597: Merge change I15b0ebb9 into eclair
Merge commit '
4ac45597fb70ca4f268cb1920fcb2de61aff4a3d' into eclair-mr2
* commit '
4ac45597fb70ca4f268cb1920fcb2de61aff4a3d':
a simple test app for gralloc
Joe Onorato [Sun, 4 Oct 2009 22:14:08 +0000 (15:14 -0700)]
am
d14cfc27: Merge change I9e384ddd into eclair
Merge commit '
d14cfc27627107c2973eeacc3bcbb2830a3fd620' into eclair-mr2
* commit '
d14cfc27627107c2973eeacc3bcbb2830a3fd620':
Add a test pattern as rollo's icon
John Wang [Sun, 4 Oct 2009 22:13:58 +0000 (15:13 -0700)]
am
99510681: Unhide constant DATA_ACTIVITY_DORMANT.
Merge commit '
99510681e9f1c76f82719e724990f744cfdbcefd' into eclair-mr2
* commit '
99510681e9f1c76f82719e724990f744cfdbcefd':
Unhide constant DATA_ACTIVITY_DORMANT.
Scott Main [Sun, 4 Oct 2009 22:05:43 +0000 (15:05 -0700)]
am
e9e1cdd5: decode the search string before putting it into the search control. this fixes a safari-only bug in which encoded chars were inserted into the search string.
Merge commit '
e9e1cdd556b40a04637b7de3d839b2a596df47e3' into eclair
* commit '
e9e1cdd556b40a04637b7de3d839b2a596df47e3':
decode the search string before putting it into the search control.
Android (Google) Code Review [Sat, 3 Oct 2009 03:35:12 +0000 (23:35 -0400)]
Merge change I0c4cec7e into eclair
* changes:
Attempt to fix [
2152536] ANR in browser
Android (Google) Code Review [Sat, 3 Oct 2009 01:40:07 +0000 (21:40 -0400)]
Merge change I7f047786 into eclair
* changes:
Update the SimpleMesh API to support new attribute types. Also spilt add/set commands to avoid permutation explosion.
Mathias Agopian [Sat, 3 Oct 2009 01:12:30 +0000 (18:12 -0700)]
Attempt to fix [
2152536] ANR in browser
The ANR is caused by SurfaceFlinger waiting for buffers of a removed surface to become availlable.
When it is removed from the current list, a Surface is marked as NO_INIT, which causes SF to return
immediately in the above case. For some reason, the surface here wasn't marked as NO_INIT.
This change makes the code more robust by always (irregadless or errors) setting the NO_INIT status
in all code paths where a surface is removed from the list.
Additionaly added more information in the logs, should this happen again.
Android (Google) Code Review [Fri, 2 Oct 2009 23:17:30 +0000 (19:17 -0400)]
Merge change Ic0d82ef1 into eclair
* changes:
[Issue
2161366] Changing capitalization of string "Via" to "via"
Android (Google) Code Review [Fri, 2 Oct 2009 21:49:59 +0000 (17:49 -0400)]
Merge change Ib4285d22 into eclair-mr2
* changes:
Change way we choose EGL surfaces to be compatible with the native window surface.
Jack Palevich [Fri, 2 Oct 2009 21:43:51 +0000 (14:43 -0700)]
Change way we choose EGL surfaces to be compatible with the native
window surface.
Android (Google) Code Review [Fri, 2 Oct 2009 20:35:51 +0000 (16:35 -0400)]
Merge change Ic66f68a7 into eclair-mr2
* changes:
Fix a null pointer exception caught by the monkey.
Android (Google) Code Review [Fri, 2 Oct 2009 20:34:02 +0000 (16:34 -0400)]
Merge change Iaf686344 into eclair
* changes:
dumpstate: Display mtime instead of ctime
Android (Google) Code Review [Fri, 2 Oct 2009 20:28:11 +0000 (16:28 -0400)]
Merge change I499a9541 into eclair-mr2
* changes:
setupRedirect() can throw. Catch it and signal the error.
Android (Google) Code Review [Fri, 2 Oct 2009 07:51:19 +0000 (03:51 -0400)]
Merge change I80ce8833 into eclair
* changes:
Icons again
Android (Google) Code Review [Fri, 2 Oct 2009 04:47:08 +0000 (00:47 -0400)]
Merge change I3ca8fb69 into eclair
* changes:
Import revised translations. DO NOT MERGE