Merge commit 'b4ef3334ca45ce43f8ed9e193e2b63208bb9624b' into eclair-plus-aosp
* commit 'b4ef3334ca45ce43f8ed9e193e2b63208bb9624b':
Change the way DRT determines if it is ready to continue to the next test when running in automated mode.
Merge commit 'c3c6621a2cf2f0d40d062dcad1c9f65485473841' into eclair-plus-aosp
* commit 'c3c6621a2cf2f0d40d062dcad1c9f65485473841':
Setting the default HTTP user agent at runtime init.
Merge commit 'c2f97178acaf9c406067b9b89776b87ddf9c8558' into eclair-plus-aosp
* commit 'c2f97178acaf9c406067b9b89776b87ddf9c8558':
Added a workaround to clear the browser cache.
Merge commit 'a13ccc908ee54d6c606b5a73b3a57e4dda13e44a' into eclair-plus-aosp
* commit 'a13ccc908ee54d6c606b5a73b3a57e4dda13e44a':
Fix test for phone number comparation. Now that there are two algorithms, we should consider them in Java layer.
Merge commit 'e5a6d16f26543061a0fc815ba90644a44995e025' into eclair-plus-aosp
* commit 'e5a6d16f26543061a0fc815ba90644a44995e025':
Fix http://b/2126318 (density test fails due to wrong-size asset stripping)
The density test expects all resources of all densities to be included, but specifying a density for a particular device build kills that. We therefore add all the required densities explicitly to the Makefile to compensate.
Merge commit 'f8c90acd7fde806d2d9cccf4d6ec52dc279497bc' into eclair-plus-aosp
* commit 'f8c90acd7fde806d2d9cccf4d6ec52dc279497bc':
Only move to the next test in DRT after the test has completed AND the page has finished loading.
Merge commit '5f78786cf9802b988a4de3c08555eb43f1e02e04' into eclair-plus-aosp
* commit '5f78786cf9802b988a4de3c08555eb43f1e02e04':
add the ability to do a newAssert with no values
Merge commit '44ca7090aca79b8c8e71d34982ae54b69968ad56' into eclair-plus-aosp
* commit '44ca7090aca79b8c8e71d34982ae54b69968ad56':
Filter out failing cases for future investigation.
to prevent apps from changing the hardware behind its back.
Fixes b/2041941 Lock screen flashes the screen very bright before dimming
Change-Id: Ice757f7ae87902bdfb3634471cf44f020ebfaae4
Signed-off-by: Mike Lockwood <lockwood@android.com>
Currently parseUserPart uses the encoded authority to split the URI
into user and non-user parts, but the parseHost and parsePort uses
the decoded URI to split the URI into non-host, host, and port parts.
This gives unexpected results when %40 ('@') and %3a (':') is used
in a URI:
Uri test = Uri.parse("http://bob%40lee%3ajr@example.com:42/");
test.getUserInfo() => "bob@lee:jr"
test.getHost() => "lee:jr@example.com" (should be "example.com")
test.getPort() => -1 (should be 42)
+ For bug 1810508
- Added PerformanceCollector class to collect runtime and memory usage data
* Moved performance snapshotting from Intrumentation to PerformanceCollector
- Added PerformanceResultsWriter interface which defines functions for
reporting performance data
+ Framework integration
- Added TimedTest annotation to automatically time tests and write results
to instrumentation output
- Modified PerformanceTestBase to add collection hooks and wrapper methods
- Modified WatcherResultPrinter in InstrumentationTestRunner to implement
PerformanceResultsWriter for instrumentation output of performance data
- Modified InstrumentationTestRunner and AndroidTestRunner to pass writer
instance to test
* changes:
new file: LowStorageTest/Android.mk new file: LowStorageTest/AndroidManifest.xml new file: LowStorageTest/res/layout/main.xml new file: LowStorageTest/res/values/strings.xml new file: LowStorageTest/src/com/android/lowstoragetest/LowStorageTest.java Add the test app which can eat up 100% of the data parition. This is for the low storage test.
new file: LowStorageTest/AndroidManifest.xml
new file: LowStorageTest/res/layout/main.xml
new file: LowStorageTest/res/values/strings.xml
new file: LowStorageTest/src/com/android/lowstoragetest/LowStorageTest.java
Add the test app which can eat up 100% of the data parition. This is for the low storage test.
new file: LowStorageTest/Android.mk
new file: LowStorageTest/src/com/android/lowstoragetest/LowStorageTest.java
