241 Commits

Author SHA1 Message Date
Eric Rowe
542cf2c9cf am 7cb0fc58: am edae848e: am 301c437b: Remove @LargeTest annotations
Merge commit '7cb0fc588042f7642f13ea2cc404eae04bd5509a'

* commit '7cb0fc588042f7642f13ea2cc404eae04bd5509a':
  Remove @LargeTest annotations
2010-08-10 12:04:04 -07:00
Eric Rowe
7cb0fc5880 am edae848e: am 301c437b: Remove @LargeTest annotations
Merge commit 'edae848eb62e27b8e987aa89557d1456304fada7' into gingerbread-plus-aosp

* commit 'edae848eb62e27b8e987aa89557d1456304fada7':
  Remove @LargeTest annotations
2010-08-10 12:00:07 -07:00
Eric Rowe
edae848eb6 am 301c437b: Remove @LargeTest annotations
Merge commit '301c437b554e2152f3f6fffadc680f5cbf8e8231' into gingerbread

* commit '301c437b554e2152f3f6fffadc680f5cbf8e8231':
  Remove @LargeTest annotations
2010-08-10 11:53:59 -07:00
Brett Chabot
4f94181282 am e967ee49: Merge "Fix gingerbread FrameworkCoreTests makefile." into gingerbread
Merge commit 'e967ee49b5a86de2be11dd1d28283c337b01e537' into gingerbread-plus-aosp

* commit 'e967ee49b5a86de2be11dd1d28283c337b01e537':
  Fix gingerbread FrameworkCoreTests makefile.
2010-08-10 10:30:32 -07:00
Brett Chabot
56718cb1cb Fix gingerbread FrameworkCoreTests makefile.
android-common should be included as a static library.

Change-Id: I539962904c84ef30e6d7bd1b48d0bc07e0757d58
2010-08-09 18:49:54 -07:00
Eric Rowe
301c437b55 Remove @LargeTest annotations
Change-Id: Ib7e6f6e8b6437db5ca2ad2bcb89f079a0cbf7453
2010-08-09 15:35:48 -07:00
Jesse Wilson
1ba4171405 Adding JsonReader.setLenient() to handle malformed JSON strings.
Also replacing setIndentSpaces() with a more general purpose method,
setIndent().

Change-Id: I64fbe4901aec23de5392362c1d40b77bc2b5566b
2010-08-06 19:24:54 -07:00
Jesse Wilson
76d7e20a75 A new streaming JSON API.
Change-Id: Iefa7ee44ddacbe22ea9ebca3165ac59030659bf2
2010-08-06 10:34:44 -07:00
Vasu Nori
bde1fc848d am 499b7438: Merge "(gingerbread) remove unused tests. bug:2898376" into gingerbread
Merge commit '499b743851aa84b9fc1a7e445e189946bc47ad5d' into gingerbread-plus-aosp

* commit '499b743851aa84b9fc1a7e445e189946bc47ad5d':
  (gingerbread) remove unused tests. bug:2898376
2010-08-05 17:15:08 -07:00
Vasu Nori
286b9770cc (gingerbread) remove unused tests. bug:2898376
Change-Id: Icc4c8ed20c9e910784bf202415d58e4af2366bee
2010-08-05 16:56:09 -07:00
Eric Rowe
3417024b03 am 5c0f1e0a: am f9ea8ec5: am 982f1521: Merge "Checkin initial bluetooth stress tests." into froyo
Merge commit '5c0f1e0a870b5792bbc0456eef6fd21642db3798'

* commit '5c0f1e0a870b5792bbc0456eef6fd21642db3798':
  Checkin initial bluetooth stress tests.
2010-08-05 15:25:26 -07:00
Eric Rowe
5c0f1e0a87 am f9ea8ec5: am 982f1521: Merge "Checkin initial bluetooth stress tests." into froyo
Merge commit 'f9ea8ec57e1e1d5654f57c22f514954e242833d2' into gingerbread-plus-aosp

* commit 'f9ea8ec57e1e1d5654f57c22f514954e242833d2':
  Checkin initial bluetooth stress tests.
2010-08-05 15:18:22 -07:00
Eric Rowe
f9ea8ec57e am 982f1521: Merge "Checkin initial bluetooth stress tests." into froyo
Merge commit '982f1521a662d274eca1216707d874f148396ac6' into gingerbread

* commit '982f1521a662d274eca1216707d874f148396ac6':
  Checkin initial bluetooth stress tests.
2010-08-05 15:10:15 -07:00
Eric Rowe
14db8d9978 Checkin initial bluetooth stress tests.
Bluetooth stress tests include stress tests for enabling/disabling bluetooth,
making the device discoverable/undiscoverable, and starting and stopping scans.

Change-Id: Ic8ba09475ffe5551717438673e0ed3f4bd17cf2f
2010-08-05 14:45:44 -07:00
Kenny Root
c44f1ffbfa am 983d4583: am dec43a10: Merge "Fix up PackageManager tests" into gingerbread
Merge commit '983d4583e7bb1788d377296fe34babc1956c0a3c'

* commit '983d4583e7bb1788d377296fe34babc1956c0a3c':
  Fix up PackageManager tests
2010-08-05 12:09:10 -07:00
Brian Carlstrom
1b7e4d5adc am 4ae1e382: Merge "Tracking merge of dalvik-dev to gingerbread" into gingerbread
Merge commit '4ae1e382f4b6c5bb9e757f35f82ad48dc02c32af' into gingerbread-plus-aosp

* commit '4ae1e382f4b6c5bb9e757f35f82ad48dc02c32af':
  Tracking merge of dalvik-dev to gingerbread
2010-08-05 10:40:45 -07:00
Brian Carlstrom
4ae1e382f4 Merge "Tracking merge of dalvik-dev to gingerbread" into gingerbread 2010-08-05 10:35:53 -07:00
Kenny Root
983d4583e7 am dec43a10: Merge "Fix up PackageManager tests" into gingerbread
Merge commit 'dec43a102226de55307de20d5779e20a435be8b1' into gingerbread-plus-aosp

* commit 'dec43a102226de55307de20d5779e20a435be8b1':
  Fix up PackageManager tests
2010-08-05 10:04:59 -07:00
Kenny Root
d7b421b4de Fix up PackageManager tests
PackageManagerTests was trying to mount and unmount the media without
waiting for the correct state to arrive. It was proceeding with any
state transition.

Some tests had their own volume mounting and unmounting code that was
flawed, so switch it to the more robust mountMedia() and unmountMedia()
implementations.

Change-Id: If464927bb09dd15cb040c6cce195a6ad8452de95
2010-08-05 08:40:09 -07:00
Brian Carlstrom
3c7c351a62 Tracking merge of dalvik-dev to gingerbread
git cherry-pick --no-commit f77cf7f0
git cherry-pick --no-commit c8f503b5285e30c1a881d0ba860ba9021f57d113
git cherry-pick --no-commit 570bb561
git cherry-pick --no-commit e2417541
git cherry-pick --no-commit e4d81f25bd4dc1a5c909b56ab56a56406290da30
git cherry-pick --no-commit 5e8a587d

Change-Id: I101a385d43f3e0f4ce5352217f92ef67a3908c88
2010-08-04 23:47:38 -07:00
Brett Chabot
f22e876393 resolved conflicts for merge of 10928c37 to master
Change-Id: Idbe91a2fe90cab0a03fdef096dc6741dc5937351
2010-08-04 12:03:46 -07:00
Brett Chabot
672079a75a Fix Framework core tests import of android-common.
android.database.CursorWindowTest#testWriteCursorToWindow (and possibly other
tests) were was failing because it couldn't locate a android-common class.

Fix is to include android-common as a static library, as opposed to a runtime
library.

Change-Id: Iae50cf409e76a85ee79e4af71e9b903d18630078
2010-08-03 17:28:19 -07:00
Brett Chabot
10928c37f1 am c458b2ca: Merge "Frameworks core tests size cleanup." into gingerbread
Merge commit 'c458b2cab3a67e84f768af2247ba5235003a4ce4' into gingerbread-plus-aosp

* commit 'c458b2cab3a67e84f768af2247ba5235003a4ce4':
  Frameworks core tests size cleanup.
2010-08-03 16:04:03 -07:00
Brett Chabot
c458b2cab3 Merge "Frameworks core tests size cleanup." into gingerbread 2010-08-03 16:02:09 -07:00
Vasu Nori
ce38b98feb do begin-end transaction before standalone insert/update/delete sql
also fix bug# 2871037
Change-Id: I13325f8eabff4f218d3206905010803b61d8e2cd
2010-08-02 14:51:33 -07:00
Xia Wang
903d445f41 am 131ce67d: Merge "DO NOT MERGE" into gingerbread
Merge commit '131ce67d276416e3cb23a5e31121fdff1a8bf290' into gingerbread-plus-aosp

* commit '131ce67d276416e3cb23a5e31121fdff1a8bf290':
  DO NOT MERGE
2010-07-30 13:46:24 -07:00
Xia Wang
8f076ec3c3 DO NOT MERGE
move change to gingerbread.

Wait for broadcast even if the network state has been changed.
bug: 2863356

Change-Id: Ia78d1d6c2906371b56dfd4765845431047e9e9c0
2010-07-29 19:15:33 -07:00
Brian Carlstrom
5e8a587d49 Tracking merge of dalvik-dev to master
Change-Id: Id4c19401ad0aa238219aaf5d9a20d2889d0a4b18
2010-07-28 23:49:30 -07:00
Brett Chabot
2af53220c9 am 6487ade9: am 5f866a4a: Make FrameworkCoreHostTests use ddmlib-prebuilt.
Merge commit '6487ade97ae4ad801681c866c846ed8862454ec4'

* commit '6487ade97ae4ad801681c866c846ed8862454ec4':
  Make FrameworkCoreHostTests use ddmlib-prebuilt.
2010-07-28 17:14:29 -07:00
Brett Chabot
6487ade97a am 5f866a4a: Make FrameworkCoreHostTests use ddmlib-prebuilt.
Merge commit '5f866a4ac389a18613180b056d946ae5a7b84e10' into gingerbread-plus-aosp

* commit '5f866a4ac389a18613180b056d946ae5a7b84e10':
  Make FrameworkCoreHostTests use ddmlib-prebuilt.
2010-07-28 17:11:01 -07:00
Brett Chabot
5f866a4ac3 Make FrameworkCoreHostTests use ddmlib-prebuilt.
Change-Id: Ib6d809353a89e33ed47a5659141ef18dc132cba6
2010-07-28 11:56:50 -07:00
Brett Chabot
f76c56bcaa Frameworks core tests size cleanup.
Adjust test sizes to better align with the test's runtime.
Also do some import cleanup and migrate to non-deprecated classes.

Change-Id: Ib2b190ddbe84f9ea8f5d6d3604bd4855d00df7a9
2010-07-27 11:55:53 -07:00
Xia Wang
69a5a96662 Wait for broadcast even if the network state has been changed.
bug: 2863356

Change-Id: If279e891cf66fcef465e85b704b0b857f6ac3742
2010-07-26 18:17:07 -07:00
Vasu Nori
fb16cbd9b2 add new API in SQLiteStatement to deprecate another.
1. SQLIteStatement.executeUpdateDelete() replaces execute() - and returns the
number of rows changed.
2. let SQLiteDatabase.execSQL() call the above new API - which
means all CRUD statements by execSQL() are stored in prepared statement cache.
3. remove the following from SQLiteDatabase
     lastrowId
     lastchangecount()
     native_execSQL()

Change-Id: I4e93a09dc381f425c3ae6ccc331a7bf227491e22
2010-07-26 13:00:07 -07:00
Xavier Ducrohet
b46507f6b8 am f8c335e8: am f72181c6: Fix hosttests to use the new ddmlib API.
Merge commit 'f8c335e85a46887de6ca771ad76ff35c713ce0c4'

* commit 'f8c335e85a46887de6ca771ad76ff35c713ce0c4':
  Fix hosttests to use the new ddmlib API.
2010-07-26 12:01:13 -07:00
Xavier Ducrohet
f8c335e85a am f72181c6: Fix hosttests to use the new ddmlib API.
Merge commit 'f72181c60943dcfb642aac1dc5fa5416c1bb566e' into gingerbread-plus-aosp

* commit 'f72181c60943dcfb642aac1dc5fa5416c1bb566e':
  Fix hosttests to use the new ddmlib API.
2010-07-26 11:43:07 -07:00
Xavier Ducrohet
f72181c609 Fix hosttests to use the new ddmlib API.
Change-Id: I629876c5baabc1cd8700604c4ebed13cc9e2168d
2010-07-26 10:53:00 -07:00
Jean-Baptiste Queru
e50282ede7 am 8a13d4e3: am f5c73101: Merge "dependent change for "parse instrumentation result bundles" in sdk"
Merge commit '8a13d4e3e5a175baddb7b8ca542d9d9941cf24a6'

* commit '8a13d4e3e5a175baddb7b8ca542d9d9941cf24a6':
  dependent change for "parse instrumentation result bundles" in sdk
2010-07-23 15:34:50 -07:00
Jean-Baptiste Queru
8a13d4e3e5 am f5c73101: Merge "dependent change for "parse instrumentation result bundles" in sdk"
Merge commit 'f5c7310152cf5537be6997412c1a42dde9fe9ecf' into gingerbread-plus-aosp

* commit 'f5c7310152cf5537be6997412c1a42dde9fe9ecf':
  dependent change for "parse instrumentation result bundles" in sdk
2010-07-23 15:32:45 -07:00
Jean-Baptiste Queru
f5c7310152 Merge "dependent change for "parse instrumentation result bundles" in sdk" 2010-07-23 15:24:55 -07:00
Vasu Nori
65a8883f0e don't store mDatabase in SQLiteCursor as it is already in SQLiteQuery
SQLiteCursor has two members: mQuery, mDatabase
but mQuery already has mDatabase.
there is no need for SQLiteCursor.mDatabase.
and everytime SQLiteQuery.mDatabase is to be used, try to use a pooled database
connection handle, if possible.
Change-Id: I42b2376d714a1a4091c843e245a45b882bb7fee6
2010-07-21 16:04:04 -07:00
Hung Dang
cbfa242609 am d652751d: am b6761e73: am 28fe43be: Merge "Add the hook which can set the device to connect to wifi and in airplane mode after reboot. This is for the power test." into froyo
Merge commit 'd652751de782bac7e37916ed5786fcfa637a2be3'

* commit 'd652751de782bac7e37916ed5786fcfa637a2be3':
  Add the hook which can set the device to connect to wifi and in airplane mode after reboot. This is for the power test.
2010-07-16 16:25:27 -07:00
Hung Dang
d652751de7 am b6761e73: am 28fe43be: Merge "Add the hook which can set the device to connect to wifi and in airplane mode after reboot. This is for the power test." into froyo
Merge commit 'b6761e73ce6b255cfe96bfa1fa6ac611abcfc067' into gingerbread-plus-aosp

* commit 'b6761e73ce6b255cfe96bfa1fa6ac611abcfc067':
  Add the hook which can set the device to connect to wifi and in airplane mode after reboot. This is for the power test.
2010-07-16 15:18:03 -07:00
Hung Dang
b6761e73ce am 28fe43be: Merge "Add the hook which can set the device to connect to wifi and in airplane mode after reboot. This is for the power test." into froyo
Merge commit '28fe43be5c364a8f7f248a5ac05cf832a83737c2' into gingerbread

* commit '28fe43be5c364a8f7f248a5ac05cf832a83737c2':
  Add the hook which can set the device to connect to wifi and in airplane mode after reboot. This is for the power test.
2010-07-16 15:15:44 -07:00
The Android Open Source Project
506e6e0882 am 3a94ab02: merge from open-source master
Merge commit '3a94ab026f0434624f233e99b1a0aadb9152a09a'

* commit '3a94ab026f0434624f233e99b1a0aadb9152a09a':
  Allow ListPreference summary to use entry
2010-07-16 13:56:16 -07:00
The Android Open Source Project
3a94ab026f merge from open-source master
Change-Id: Ib00a02e90d5c2c0b4cc1919258b858930967198b
2010-07-16 13:50:12 -07:00
Yu Shan Emily Lau
ba1348e3c2 Add the hook which can set the device to connect to wifi and in airplane mode after reboot. This is for the power test.
Change-Id: I42527612764252d1c47bd29a2b88d5e3019cfdf9
2010-07-16 12:00:30 -07:00
Kenny Root
ba636df784 Allow ListPreference summary to use entry
Currently when ListPreferences are used in a PreferenceActivity, the summary
values are set to the same as the current index in mEntryValue. This patch
adds the ability for a string substitution to be used in the summary
which points to the corresponding entry in mEntries to aid in
localization.

For example a preference may be named "color" with the following attributes
in the locale "de" (German):

mEntryValues = { "red", "green", "blue" }
mEntries = { "rot", "grün", "blau" }
mSummary = "Die Farbe ist %1$s."

getSummary() returns "Die Farbe ist grün."

Change-Id: Iea169ac3d1c9d6290d853fc7c67a7c4c8a11bb90
2010-07-13 10:28:44 -07:00
Guang Zhu
abcdecc017 dependent change for "parse instrumentation result bundles" in sdk
Change-Id: Ie3708d30620a703909829c32f5599816cc52b3f6
2010-07-12 15:00:36 -07:00
Vasu Nori
e25539fdfd reduce locking when using SQLiteStatement
Do compiling of sql, binding of args and execution of the SQL
statement within one single database lock period.
This reduces the number of times the database lock
needs to be acquired during the course of compilation, binding
and execution of a SQLiteStatement.

Change-Id: I22b090ec9e10fc0aa2532a93bafe610af2546b58
2010-07-09 12:31:12 -07:00