Merge commit '57bda83d105a1fc3c4c0ccb6cb743e6ba7c98870' into eclair-plus-aosp
* commit '57bda83d105a1fc3c4c0ccb6cb743e6ba7c98870':
Add a test app that has 100 icons. None of them do anything when clicked.
Merge commit 'ea48cd6dd4e64bcb5c840a12fe052f704510e01c' into eclair-plus-aosp
* commit 'ea48cd6dd4e64bcb5c840a12fe052f704510e01c':
Use a diff that ignores trailing whitespaces to get by some layout test failures.
Forgot to do this with previous check in. Now that calculateLength() has
been fixed to match the actual encoding (ie, doesn't support single-segment
EMS), test case needs to be updated.
Fixes b/2244483
Merge commit 'c3f3f9a90b7d7f8a9665df9c194cff81d0d1782c' into eclair-plus-aosp
* commit 'c3f3f9a90b7d7f8a9665df9c194cff81d0d1782c':
Another test for StatusBar test.
- Added new functions to PerformanceCollector and PerformanceResultsWriter
- Modified unit tests to test new functionality and fix flakiness reported in
2218327 and 2118268
- Added PerformanceCollectorTest to small suite
Merge commit 'aebcaec3c171f636a24051ce85ded2f86b09461b' into eclair-plus-aosp
* commit 'aebcaec3c171f636a24051ce85ded2f86b09461b':
Remove the activity restart between urls.
Merge commit '6270d52c0dded8658733a392f3ef1f521bc5dbee' into eclair-plus-aosp
* commit '6270d52c0dded8658733a392f3ef1f521bc5dbee':
Disable known failure math tanhd tests (DO NOT MERGE)
Merge commit '9e58e6427c8e5fefb65432ea4b56c6cb31e80bbd' into eclair-plus-aosp
* commit '9e58e6427c8e5fefb65432ea4b56c6cb31e80bbd':
Enable some tests that requires local http server
Merge commit 'c404ed2be5d29c8932a3d69b53fea4653c9b868b' into eclair-plus-aosp
* commit 'c404ed2be5d29c8932a3d69b53fea4653c9b868b':
Fix failing unit test; the test was using a deprecated API making it fail on WVGA devices.
Merge commit '277a41a771c56727ad7456dad23f964e9e3ed546' into eclair-plus-aosp
* commit '277a41a771c56727ad7456dad23f964e9e3ed546':
rebase layout test result as the numbers reported are much more stable now
Merge commit '1cdb55aa97d8035a941a4bd7cf23063f18360ab5' into eclair-plus-aosp
* commit '1cdb55aa97d8035a941a4bd7cf23063f18360ab5':
Added code style fix that actually did not get submitted in 2nd patch of previous change.
Merge commit 'c18b0ebcfb905cc5001618c78890e884a859e069' into eclair-plus-aosp
* commit 'c18b0ebcfb905cc5001618c78890e884a859e069':
Add checks for double-dumping on webkit data.
Also some logs seem to suggest that in rare occations, a webkit dump after timeout has occured actually never hears any response back from webkit, thus causing the test app to wait forever, because the request webkit data mechanism is not protected by a timeout watchdog. So adding a explicit log print before calling webkit dump for monitoring in future test runs.
Merge commit 'd021ea27cea0ea14ad0e0295eaa51c94e92946fc' into eclair-plus-aosp
* commit 'd021ea27cea0ea14ad0e0295eaa51c94e92946fc':
Modified the test case name for the browser page load test.
Merge commit '5648dbb1dabc0231fe953ad45916c067c79986c8' into eclair-plus-aosp
* commit '5648dbb1dabc0231fe953ad45916c067c79986c8':
DO NOT MERGE: Cleaning up the PipedStreamTest
NeighboringCellInfo works in GSM and UMTS network.
In GSM network, the locaiton value is the combination of LAC and CID.
In UMTS network, the locaiton value is PSC code.
NeighboringCellInfo should access and store those two values seperately.
It involves the change of Public API.
1. Add new API getRadioType(), getLac(), and getPsc() to get location info in GSM and UMTS.
2. Deprecate setCid() and NeighboringCellInfo(int cid) because cid is set by interpreting network type.
