Commit Graph

13840 Commits

Author SHA1 Message Date
Suchi Amalapurapu
6e78c82f00 Merge "Clean up stale containers if needed at install time. This is needed when restoring applications installed on sdcard via Market after a data wipe. The stale containers need to be cleaned up before reinstalling again. Add a test case for installing when a stale container exists." 2010-03-24 10:43:59 -07:00
Fred Quintana
c031222cc9 Merge "fix bug where sync settings set lost upon upgrade from donut and eclair to froyo" 2010-03-24 10:39:28 -07:00
Jae-Hyung Ahn
7efc2fc955 gl_code : add end of line.
Signed-off-by: Jae-Hyung Ahn <jerry.ahn@windriver.com>
2010-03-24 10:15:41 -07:00
Vasu Nori
a13ad93403 Merge "when corruption occurs, log a warning before closing db" 2010-03-24 10:11:19 -07:00
Mike Lockwood
7bdf0424ae Merge "Wait until GpsLocationProvider is fully initialized before returning from the constructor." 2010-03-24 09:53:03 -07:00
Mike Reed
7ecdf3c8af Merge "If we detect a 9patch chunk, force the config chooser to avoid 565, with its pre-dithering madness" 2010-03-24 09:45:58 -07:00
Suchi Amalapurapu
23810c4776 Merge "Add new activity manager method to get list of running applications installed on sdcard. Use new method in UsbStorageActivity. Fix moving dex files. moveDex should be suffixed with LI since it uses Installer" 2010-03-24 08:34:31 -07:00
Leon Clarke
3ae275f8eb Merge "Fix for when flash loads cached crossdomain.xml files. Cache the x-permitted-cross-domain-policies header. http://b/issue?id=2519669" 2010-03-24 05:09:53 -07:00
Jack Palevich
42d766323b Merge "GLSurfaceView: Log egl failures" 2010-03-23 21:20:42 -07:00
Mathias Agopian
0426068fb3 Merge "another small step towards fixing [2501808] sapphire: OOM in GPU Surface area" 2010-03-23 20:17:13 -07:00
Neal Nguyen
b6ccfb5d64 Merge "Adding some automated tests for apps on SD (and their corresponding apps)." 2010-03-23 18:31:26 -07:00
Adam Powell
1089d0d316 Merge "Fix bug 2531732 - DateTimeView explodes on bad system date format." 2010-03-23 17:40:02 -07:00
Christopher Tate
06a23e6a4f Merge "Return the right thing from Context.getApplicationContext()" 2010-03-23 17:26:09 -07:00
Dianne Hackborn
f7293853c9 Merge "Fix issue #2538211: system server crash" 2010-03-23 16:44:48 -07:00
Adam Powell
24cd9f9152 Merge "Make WebView scroll bars compress during overscroll." 2010-03-23 16:40:36 -07:00
Mathias Agopian
ce00b17c1f Merge "one step toward fixing [2501808] sapphire: OOM in GPU Surface area" 2010-03-23 16:29:03 -07:00
Xia Wang
0b44d8df3c Merge " * Move connectivity manager test closer to source. * Add license header to java files * Remove google related information from the test" 2010-03-23 15:37:32 -07:00
Andreas Huber
bf7742d6a8 Merge "Clear the local prefetcher strong reference before signalling that prepare() was cancelled early in order to avoid a race condition that occasionally triggered an assertion from the main thread." 2010-03-23 15:34:18 -07:00
Adam Powell
4f14104050 Merge "Fix bug 2537626." 2010-03-23 14:10:50 -07:00
Adam Powell
52fdbe3fda Merge "Fix bug 2495033." 2010-03-23 14:10:00 -07:00
Vasu Nori
38805a4ab2 Merge "print finalizer warning before closing the cursor in finalize" 2010-03-23 13:03:43 -07:00
Romain Guy
a3ce8b6676 Merge "Correctly bind spinner data to TextView. Bug http://code.google.com/p/android/issues/detail?id=7251" 2010-03-23 12:44:13 -07:00
Derek Sollenberger
b26c847cef Merge "fixing problem with allocating too much memory to a surface by fixing the size of the surface when it exceeds a threshold and resizing the surface when it falls beneath the threshold." 2010-03-23 12:35:35 -07:00
Patrick Scott
fea7c4e600 Merge "Fix rebuilding of these two apks." 2010-03-23 12:34:53 -07:00
Dianne Hackborn
4b32d5e33a Merge "Improve switching to car mode, retain night mode option." 2010-03-23 11:54:09 -07:00
Dianne Hackborn
d57027b123 Merge "Don't use dim behind for the search box." 2010-03-23 11:53:12 -07:00
Dianne Hackborn
f1ce8665f2 Merge "Fix bug where group IDs were not being assigned during boot." 2010-03-23 11:52:14 -07:00
Jean-Baptiste Queru
25de2edd20 Merge "Make DownloadBase public" 2010-03-23 11:49:54 -07:00
San Mehat
d18322c729 Merge "Asec: Add new 'StorageNotFound' response code handling for container paths" 2010-03-23 11:25:31 -07:00
Mike Lockwood
8a02a55478 Merge "LocationTracker: Fix default values for debug and signal strength logging." 2010-03-23 10:53:25 -07:00
Suchi Amalapurapu
ba6dd5917d Merge "Don't delete stale containers on sdcard. Comment out flaky test" 2010-03-23 10:27:51 -07:00
Vasu Nori
397e8c2558 Merge "close SQLiteStatement objects in finally block" 2010-03-23 10:16:38 -07:00
Robert Greenwalt
1e25b88b9c Merge "Fix Tethering when DUN is required but wifi is ok" 2010-03-23 09:52:07 -07:00
Kenny Root
c00eb796eb Merge "Compact when NativeDaemonConnector hits buffer limit" 2010-03-23 08:07:47 -07:00
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
8af09ea3bb merge from open-source master
Change-Id: I6d111015c27324b9ae94ac4701ba1a7187f97ee8
2010-03-22 16:13:27 -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