Scott Main
4c4334d5c4
Merge "docs: remove old tutorial and sample pages from the sitemap" into eclair
2010-02-12 15:25:44 -08:00
Eric Laurent
fde9e349dd
Merge "Fix issue: 2413494: Add TTY support." into eclair
2010-02-11 09:23:21 -08:00
Dirk Dougherty
a10ec4b8b1
Merge "Repackage samples zip with SampleSyncAdapter and CubeLiveWallpaper." into eclair
2010-02-10 09:38:01 -08:00
Bart Sears
6e4c139af2
Merge "DO NOT MERGE" into eclair
2010-02-10 09:35:37 -08:00
Bart Sears
0985807e21
Merge "DO NOT MERGE" into eclair
2010-02-10 09:13:48 -08:00
Dirk Dougherty
88d505a68e
Merge "Add generated html docs for SampleSyncAdapter and CubeLiveWallpaper. Add article for live wallpaper." into eclair
2010-02-09 18:41:32 -08:00
The Android Open Source Project
93fe6a1cee
reconcile main tree with open-source eclair
2010-02-05 08:09:38 -08:00
Katie McCormick
6225fcd804
Merge "SDK doc change: Fixed typo--fingure->finger Bug: 1993220" into eclair
2010-02-03 16:52:18 -08:00
Scott Main
957a1a2571
Merge "docs: revise the Style and Themes document to improve the clarity of the concepts and expand the available information" into eclair
2010-02-03 16:11:41 -08:00
Megha Joshi
277345ae33
Merge "Screenshots for sample syncadapter." into eclair
2010-02-03 12:24:20 -08:00
Mike Lockwood
97c0df6c31
Merge "Ignore NTP time fixes that differ from system time by more than 5 minutes." into eclair
2010-01-29 20:09:16 -08:00
John Wang
2d15d737b7
Merge "Handle RIL_UNSOL_RESEND_INCALL_MUTE." into eclair
2010-01-29 20:07:14 -08:00
The Android Open Source Project
9a2ed22a74
reconcile android-2.1_r1 snapshot
2010-01-29 14:09:16 -08:00
Scott Main
f2d703adf0
Merge "docs: update web page debugging with info about page and line numbering in the log." into eclair
2010-01-29 13:40:53 -08:00
Dirk Dougherty
aa51f1a242
Merge "SDK doc change: Increment the platform version var used in doc footer and elsewhere." into eclair
2010-01-28 17:59:24 -08:00
Dirk Dougherty
d08c5fb5c8
Merge "SDK doc change: fix android:glEsVersion description, add live_wallpaper feature, indicate market filtering on features." into eclair
2010-01-28 16:40:56 -08:00
Dirk Dougherty
ddacb39772
Merge "doc change only: Update announcement and mwc redirect to point to microsite." into eclair
2010-01-26 18:00:29 -08:00
Robert Greenwalt
06fb48ea18
Merge "Refine fix I53e91db7 to apply only to wifi network" into eclair
2010-01-25 16:50:10 -08:00
Scott Main
e3ec5eb95b
Merge "docs: reference the history JS file with docRoot in order to make offline doc searches work. (I think this was a regression due to a missed merge.) Bug: 1909300" into eclair
2010-01-25 15:39:46 -08:00
Mike Reed
e14a1ad9cc
Merge "disable high-quality filtering during scrolling, until I can cached the scaled images." into eclair
2010-01-25 06:19:17 -08:00
Jim Miller
4691ef5e0f
Merge "Fix 2287263: Change carrier TextView to be 1 line and marquee if text is too long." into eclair
2010-01-22 20:19:12 -08:00
Dirk Dougherty
79643e1692
Merge "SDK doc change: Misc small fixes." into eclair
2010-01-22 16:45:58 -08:00
Dirk Dougherty
770a2991ab
Merge "SDK doc change: Add "fetch by http" workaround for connection problems in SDK Manager." into eclair
2010-01-22 16:38:59 -08:00
Dianne Hackborn
29513890e3
Merge "Fix issue #2391429 : Crash during boot if fwd locked app is incompletely installed" into eclair
2010-01-22 15:47:08 -08:00
Dirk Dougherty
a2fa14097b
Merge "doc change: add announce for developer lab at mwc. move adc to carousel." into eclair
2010-01-22 14:23:39 -08:00
John Wang
0ac75bfa33
Merge "Updated emergency string when locale changes." into eclair
2010-01-22 13:17:25 -08:00
Eric Laurent
17739fe712
Merge "Fix issue 2388215: Audio not routed to 3.5mm Headset after removal/insertion." into eclair
2010-01-22 10:14:26 -08:00
Fred Quintana
4910d5fb2e
Merge "initialize sync adapters that get installed while the system is running bug http://b/issue?id=2360782 " into eclair
2010-01-21 17:30:07 -08:00
Yu Shan Emily Lau
c125c2cd7c
Merge "Instead of caputre the memory footprint before and after the test. We would like to monitor the memory trend while the test is running. This can eliminate the overhead for the frist test case in creating the player." into eclair
2010-01-21 15:07:51 -08:00
John Wang
402dce2453
Merge "Add Emergency Calls Only String." into eclair
2010-01-21 13:38:32 -08:00
Wei Huang
34c0d1e324
Merge "fix bug 2264186: clean up the outstanding async queries in ContactHeaderWidget." into eclair
2010-01-21 12:21:11 -08:00
Ying Wang
936155884a
Merge "Find layout classes in all "layout-*" dirs." into eclair
2010-01-21 11:07:14 -08:00
Robert Greenwalt
315503b59b
Merge "Try to switch to another default net on connection failure." into eclair
2010-01-21 09:57:46 -08:00
Irfan Sheriff
fd94379c35
Merge "Use MCC value to always override channel count setting" into eclair
2010-01-21 07:46:49 -08:00
Grace Kloba
965f42fdf1
Merge "DO NOT MERGE" into eclair
2010-01-20 23:30:05 -08:00
Nick Pelly
1a01fad3c3
Merge "Fix failure to open AVRCP input device due to EPERM." into eclair
2010-01-20 20:43:54 -08:00
Nick Pelly
c81bb207c6
Fix failure to open AVRCP input device due to EPERM.
...
Sleep for 100us and try to open the input device again if it fails, with a
maximum of 10 attempts.
We need the retry logic because setting permissions on a new input device is
racy. The init process watches for new input device (via uevent) and sets the
permission on them in devices.c:make_device(). However at the same time
EventHub.cpp watches for new input devices from the system_server process, and
immediately tries to open them. I can't see a simple way to avoid this race
condition.
As best as I can tell this race condition has always exisited.
There must have been some timing change that happened recently that causes us
to hit this race condition much more often. See repro notes in referenced bug.
Bug: 2375632
2010-01-20 19:56:24 -08:00
Mike Reed
500f9b1400
Merge "Do not merge" into eclair
2010-01-20 18:32:32 -08:00
Grace Kloba
eb2b50e72b
Merge "Fix the sloppy detection in the ScaleGestureDetector." into eclair
2010-01-20 17:36:50 -08:00
Xavier Ducrohet
be2fe55fe2
Merge "SDK doc change: Add doc update for NDKr3." into eclair
2010-01-20 17:30:27 -08:00
Scott Main
3166fe7448
Merge "docs: add guide to copying and installing the Dev Tools app from the emulator to a device." into eclair
2010-01-20 17:10:25 -08:00
Irfan Sheriff
01357fd7fc
Merge "DO NOT MERGE Avoid wifi disable in a UNKNOWN state" into eclair
2010-01-20 13:26:08 -08:00
Robert Greenwalt
73f2e99241
Merge "Add bugreport info about network feature use. DO NOT MERGE" into eclair
2010-01-20 13:26:04 -08:00
Mike Reed
7bd707a420
Merge "Do not merge" into eclair
2010-01-20 13:17:49 -08:00
Robert Greenwalt
9110cdd7b7
Merge "Cleanup of process-specific DNS." into eclair
2010-01-20 11:08:13 -08:00
Mike Lockwood
7b06197d8a
Merge "Be tolerant of GPS session and engine on status messages arriving out of order." into eclair
2010-01-20 10:00:55 -08:00
Xavier Ducrohet
5820b33a50
Merge "ADT/Layoutlib: implement sweep gradient." into eclair
2010-01-20 09:43:46 -08:00
Adam Powell
e35804e8d7
Merge "Edge of screen slop detection for ScaleGestureDetector." into eclair
2010-01-19 16:40:17 -08:00
Scott Main
044e2017f7
Merge "docs: add a section about debugging web pages with the Console APIs; revise and cleanup some of the other content." into eclair
2010-01-19 16:18:52 -08:00
Xavier Ducrohet
299694ac75
Merge "ADT/Layoutlib: implement radial gradient." into eclair
2010-01-19 14:48:58 -08:00
