Dan Egnor 86ef717e26 am 99cee031: Merge change Ieb7a7d57 into eclair-mr2 ...

Merge commit '99cee0318bdceb6e996bbe9a3e0f961d622e0365' into eclair-mr2-plus-aosp

* commit '99cee0318bdceb6e996bbe9a3e0f961d622e0365':
  Change the DropBoxManager API slightly (this is public, but not yet released) --

2009-11-25 13:04:19 -08:00

..

accounts

do not merge: cherrypicked 3710f39096 from master branch

2009-08-15 22:40:25 -07:00

activity

Disable flaky and failing tests.

2009-10-26 17:44:38 -07:00

content

donut snapshot

2009-07-29 14:25:07 -07:00

graphics

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

os

PerformanceCollector: Collect & report perf measurements in key/value form

2009-10-28 14:32:05 -07:00

vcard

Fix a problem in which Android custom fields are not emitted correctly in non-Ascii languages.

2009-11-20 16:13:07 +09:00

AndroidPerformanceTests.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

AndroidTests.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

ApacheHttpTests.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

AppCacheTest.java

Suppress flaky test AppCacheTest#testFreeApplicationCacheSomeFiles

2009-10-30 17:45:09 -07:00

ArrayListTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

BitwiseStreamsTest.java

donut snapshot

2009-07-21 11:16:54 -07:00

BrickDeniedTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

BuildTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

CdmaSmsTest.java

Update CdmaSmsTest unit test.

2009-11-06 11:55:19 -08:00

CharSequencesTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

ComponentTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

ContentQueryMapTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

CreateViewTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

CursorWindowTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

DatabaseCursorTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

DatabaseGeneralTest.java

fix bug 2134367: failing phone number compare test.

2009-09-22 21:52:41 -07:00

DatabaseLocaleTest.java

auto import from //branches/cupcake/...@137873

2009-03-11 12:11:56 -07:00

DatabaseLockTest.java

AI 146177: am: CL 145969 am: CL 145735 Suppress the flaky DatabaseLockTest

2009-04-14 12:38:22 -07:00

DatabasePerformanceTests.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

DatabaseStatementTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

DatabaseStressTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

DatabaseTests.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

DbSSLSessionCacheTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

DropBoxTest.java

Change the DropBoxManager API slightly (this is public, but not yet released) --

2009-11-25 12:38:00 -08:00

ExpatPerformanceTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

GeocoderTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

GoogleHttpClientTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

GoogleLoginServiceTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

GraphicsPerformanceTests.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

GsmSmsTest.java

Fix broken GSM SMS unit test, and general cleanup.

2009-09-07 16:16:10 +08:00

HashMapTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

HashSetTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

HashtableTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

HeapTest.java

Disable com.android.unit_tests.HeapTest:testExternalOomeLarge.

2009-10-19 17:34:33 -07:00

HtmlTest.java

donut snapshot

2009-07-29 14:25:07 -07:00

InflateTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

InstanceofTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

JavaPerformanceTests.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

JniLibTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

LabelView.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

LinkedListTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

LinkifyTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

LocalSocketTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

LocationManagerTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

LogTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

MathTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

MccTableTest.java

Promote MccTable to telephony and use it for both gsm/cdma

2009-09-03 12:34:15 -07:00

MenuTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

MonitorTest.java

donut snapshot

2009-08-11 13:12:34 -07:00

NeighboringCellInfoTest.java

Update CID in NeighboringCellInfo

2009-09-25 12:17:46 -07:00

NewDatabasePerformanceTests.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

NewDatabasePerformanceTestSuite.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

ParentalControlTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

PerformanceTests.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

SafeSaxTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

SearchableActivity.java

donut snapshot

2009-07-21 11:16:54 -07:00

SearchablesTest.java

donut snapshot

2009-07-29 14:25:07 -07:00

SearchManagerTest.java

donut snapshot

2009-07-31 17:38:20 -07:00

SerializationTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

SettingsProviderTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

SimplePullParserTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

SmsProviderTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

SpannedTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

SSLClientSessionCacheFactoryTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

SSLTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

StringTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

SuggestionProvider.java

donut snapshot

2009-07-21 11:16:54 -07:00

TestHttpClient.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

TestHttpServer.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

TestHttpService.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

TextLayoutTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

TextUtilsTest.java

donut snapshot

2009-07-21 11:16:54 -07:00

TextViewPerformanceTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

TextViewTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

ThreadBitmapTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

TimeTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

TimeUtilsTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

TraceTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

TreeMapTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

TreeSetTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

UriMatcherTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

UriTest.java

Make Uri.parseUserPart, parseHost, and parsePort symmetric

2009-09-14 17:45:04 -07:00

UrlRulesTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

VectorTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

VpnTest.java

Remove deprecated VpnType.getDescription().

2009-09-30 18:39:48 +08:00

WebkitTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00