Commit Graph

13503 Commits

Author SHA1 Message Date
Mike Lockwood
1bc40285cd Merge "GpsLocationProvider: Do our work in a Handler running in a separate thread." 2010-03-23 04:54:18 -07:00
Kenny Root
dbed7c65ef Merge "Advance encodedKeySearchIndex if encodedKey matches a suffix of a parameter." 2010-03-22 23:18:52 -07:00
satok
6a6b2ab160 Merge "Call super.close() in MargeCursor" 2010-03-22 22:40:10 -07:00
Romain Guy
d290a36336 Merge "Improve export to bitmap layers for HierarchyViewer." 2010-03-22 19:08:22 -07:00
Dianne Hackborn
93603a6288 Merge "Fix restoring of permissions after a reboot." 2010-03-22 18:19:10 -07:00
Shimeng (Simon) Wang
8756db1836 Merge "Check mWebViewCore to prevent potential NPE." 2010-03-22 17:21:48 -07:00
The Android Open Source Project
6ce0f25eee merge from open-source master
Change-Id: Ie60db5faf407344b8fbe3d5c1e7c01e927ff251e
2010-03-22 15:55:38 -07:00
Eric Laurent
8b199523b2 Merge "Fix issue 2472495: Phone cannot be set to silent mode via volume keys while Driveabout is taking." 2010-03-22 15:48:42 -07:00
Jake Hamby
49ee14d516 Merge "Fix some typos and logging of calls to CDMA methods." 2010-03-22 15:47:37 -07:00
Mike Lockwood
43a50a58f7 Merge "Improve wakelock debugging:" 2010-03-22 14:28:36 -07:00
Romain Guy
a45d5a7903 Merge "Fix possible NPE in AdapterView's OnItemClickListener clients. Bug #2533718" 2010-03-22 14:20:15 -07:00
Jean-Michel Trivi
8c7a1cd9b5 Merge "Unhide the MediaButton receiver API in android.media.AudioManager" 2010-03-22 13:59:09 -07:00
Mathias Agopian
245b46fb0c Merge "Updated to WMM2010" 2010-03-22 13:17:50 -07:00
Derek Sollenberger
0456a75e48 Merge "Adding a hidden method to check if a surface is fixed in size." 2010-03-22 13:10:50 -07:00
Brad Fitzpatrick
cc05322aef Merge "Make getting wifi state lockless." 2010-03-22 12:49:25 -07:00
Marco Nelissen
c39abb32f1 Merge "Fix Tabwidget copy/paste bug." 2010-03-22 12:03:37 -07:00
Mark Wagner
c63a16b3cc Merge "null check" 2010-03-22 11:51:51 -07:00
Xia Wang
5a45b7aa37 Merge "Add connectivity manager automation test framework: - Create a dummy activity - ConnectivityManagerTestActivity - to listen to broadcast from connectivity manager, to control wifi, and to verify that connectivity information for different network types. This framework will be used for funcitonal tests and stress tests." 2010-03-22 11:16:16 -07:00
Marco Nelissen
a35a389873 Merge "Fix javadoc copy/paste error." 2010-03-22 11:14:38 -07:00
Nick Kralevich
0c16989834 Merge "Unittests for EntropyService. Make EntropyService more testable." 2010-03-22 11:14:25 -07:00
San Mehat
7f7a01b2fb Merge "MountService: Handle volumes shared on startup" 2010-03-22 10:30:27 -07:00
Nick Pelly
1ebde0a725 Merge "Everytime Bluetooth was turned off two file descriptors were not closed" 2010-03-22 07:07:15 -07:00
Steve Block
6845ea6cb1 Merge "Implements layoutTestController.setAppCacheMaximumSize" 2010-03-22 03:44:09 -07:00
Patrick Scott
b5ecdd445f Merge "Compare the cookie names to ensure a consistent ordering." 2010-03-19 17:59:39 -07:00
Brian Carlstrom
cf481db459 Merge "b/2511635 Browser displays incorrect SSL cert information" 2010-03-19 17:49:37 -07:00
Amith Yamasani
1858b59da6 Merge "Move the key feedback bubble to the side if there's not enough room above. bug: 2519903" 2010-03-19 17:31:31 -07:00
Mathias Agopian
6795478949 Merge "libutils Condition are now PRIVATE by default" 2010-03-19 17:20:08 -07:00
Jean-Michel Trivi
7d94746bb5 Merge "Fix two AudioFocus issues: - if a focus owner abandons audio focus during a call, the next focus owner in the stack was never notified - if a focus owner requests the focus while alread owning it, and the type of focus request changes, the previous focus owner was not notified that the type of focus loss had changed." 2010-03-19 16:31:34 -07:00
Dmitry Shmidt
960a4f6625 Merge "Fix bcm4329 FW dump in bugreport for user-debug build" 2010-03-19 16:26:52 -07:00
Irfan Sheriff
ff7230e273 Merge "Allow space in SSID" 2010-03-19 16:17:00 -07:00
Mathias Agopian
26d244281a libutils Condition are now PRIVATE by default
Condition must be initialized with SHARED for the old behavior, where
they can be used accross processes.

Updated the two places android that require SHARED conditions.

PRIVATE conditions (and mutexes) use more efficient syscalls.

Change-Id: I9a281a4b88206e92ac559c66554e886b9c62db3a
2010-03-19 16:16:43 -07:00
Christopher Tate
4e7876ff2f Merge "Use atomic++ rather than lock/++/unlock in the input dispatch code path" 2010-03-19 16:13:33 -07:00
Eric Olsen
0784654cbe Merge "Add check for null name on SCO connect" 2010-03-19 14:51:53 -07:00
Irfan Sheriff
da54d4d500 Merge "Fix wakelock" 2010-03-19 14:08:01 -07:00
Dianne Hackborn
147571a1fe Merge "Fix issue #2512131: Trackball goes up when moving" 2010-03-19 14:01:48 -07:00
Suchi Amalapurapu
b3ff07b72a Merge "Grant permissions to apps on sd when enabling/disabling packages." 2010-03-19 13:38:50 -07:00
Christopher Tate
e351e6a9bc Merge "Ensure that binder incalls to the system process keep the fg cgroup" 2010-03-19 12:42:29 -07:00
Kenny Root
132c20fa26 Merge "Ensure adapter is not null in AutoCompleteTextView" 2010-03-19 11:59:56 -07:00
Brett Chabot
bad38beacc Merge "Add -e package description to InstrumentationTestRunner javadoc." 2010-03-19 11:41:42 -07:00
Grace Kloba
2bf414ce64 Merge "Change overscroll background to be same as status bar pulldown." 2010-03-19 10:41:01 -07:00
Vasu Nori
81ce9a1358 Merge "limit sql statement in finalizer warning to 100 chars" 2010-03-19 10:38:29 -07:00
Eric Olsen
cc6467b25e Merge "Add the blacklist for the SCO connections" 2010-03-19 10:26:53 -07:00
Marco Nelissen
2e3b71106c Merge "We should pass null for the album artist if it was not set, instead of a copy of the artist, since the media provider needs to know whether the album artist was actually set." 2010-03-19 10:25:13 -07:00
Romain Guy
45ffa11ea6 Merge "Force all views to relayout when ViewRoot is resized. Bug #2519590" 2010-03-19 09:34:31 -07:00
Robert Greenwalt
5c3597018b Merge "Add support for DUN over a cdma connection." 2010-03-19 09:03:27 -07:00
Robert Greenwalt
8c0e3ffde7 Merge "Fix Tethering Notifications for multiple ifaces" 2010-03-19 09:02:00 -07:00
Steve Block
a18234c6e7 Merge "Fix HttpAuthHandler for synchronous requests" 2010-03-19 08:47:56 -07:00
Dianne Hackborn
ef41eb28ee Merge "Fix issue #2512507: Shortcuts and Widgets lost on upgrading from Eclair to FRE70D" 2010-03-18 19:25:57 -07:00
Kenny Root
50317673e9 Merge "Make aapt warning concise" 2010-03-18 19:15:51 -07:00
Dianne Hackborn
2cfdc6bed2 Merge "Only backup real files." 2010-03-18 18:26:06 -07:00