Merge commit 'f996ed9f2e4a992e5d884077a15dcc23a8d90c44' into gingerbread-plus-aosp
* commit 'f996ed9f2e4a992e5d884077a15dcc23a8d90c44':
Make vCard importer/exporter aware of multi-byte parameters.
Bluetooth stress tests include stress tests for enabling/disabling bluetooth,
making the device discoverable/undiscoverable, and starting and stopping scans.
Change-Id: Ic8ba09475ffe5551717438673e0ed3f4bd17cf2f
Merge commit '4ae1e382f4b6c5bb9e757f35f82ad48dc02c32af' into gingerbread-plus-aosp
* commit '4ae1e382f4b6c5bb9e757f35f82ad48dc02c32af':
Tracking merge of dalvik-dev to gingerbread
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
move change to gingerbread.
Wait for broadcast even if the network state has been changed.
bug: 2863356
Change-Id: Ia78d1d6c2906371b56dfd4765845431047e9e9c0
Merge commit '5f866a4ac389a18613180b056d946ae5a7b84e10' into gingerbread-plus-aosp
* commit '5f866a4ac389a18613180b056d946ae5a7b84e10':
Make FrameworkCoreHostTests use ddmlib-prebuilt.
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
Merge commit 'f72181c60943dcfb642aac1dc5fa5416c1bb566e' into gingerbread-plus-aosp
* commit 'f72181c60943dcfb642aac1dc5fa5416c1bb566e':
Fix hosttests to use the new ddmlib API.
Merge commit 'f5c7310152cf5537be6997412c1a42dde9fe9ecf' into gingerbread-plus-aosp
* commit 'f5c7310152cf5537be6997412c1a42dde9fe9ecf':
dependent change for "parse instrumentation result bundles" in sdk
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.
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.
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
Previously tests/framework-tests contained a quarantined set of test classes
that needed access to package-private framework api. Running these tests
normally would cause the dalvik verifier to throw errors.
runtest now has support for turning off the dalvik verifier for frameworks
tests, so move this tests into their recommended location, close to the source
being tested.
Also move policy source into a 'src' folder to accommodate the tests move.
Change-Id: I62f839da185a55bc553b653bf583fd99da438512
Merge commit '3716ea04d9fd59ff95bacdf6efac4ab5583e13fc' into kraken
* commit '3716ea04d9fd59ff95bacdf6efac4ab5583e13fc':
If the network SSID is a string, it should be enclosed in double quotation marks.
Merge commit '069067963cf0117cfb4a1aef99b550b126d9ca92' into froyo-plus-aosp
* commit '069067963cf0117cfb4a1aef99b550b126d9ca92':
If the network SSID is a string, it should be enclosed in double quotation marks.
The EBNF statemachine description language was to difficult
to remember changed to use a simpler and more obvious psuedo
language.
Added HANDLED and NOT_HANDLED as it makes the psuedo code
more obvious.
Added getCurrentMessage primarily for use by code in enter
so that it can know why the new state is being entered.
Change-Id: I1446e417b77684fbde0020b1da0975eedc57cce4
Merge commit '7361b7410f2427022cc8917b00553dc26107cded' into kraken
* commit '7361b7410f2427022cc8917b00553dc26107cded':
Uncomment a test that was marked as STOPSHIP
Merge commit '4a0823e5486f16b10762076d629f2f7e4d5da476' into froyo-plus-aosp
* commit '4a0823e5486f16b10762076d629f2f7e4d5da476':
Uncomment a test that was marked as STOPSHIP
Initialize the cache path only if the container exists.
This did exist before but was somehow removed.
Fix a known test failure as well.
Change-Id: I63219369b0e7abca4919fbde2a04035a0fea9e35
