merge in jb-mr0-release history after reset to jb-dev
merge in jb-mr0-release history after reset to jb-dev
merge in jb-mr0-release history after reset to jb-dev
Skip MIFARE Ultralight test for an unsupported device DO NOT MERGE

If a device doesn't have the feature "com.nxp.mifare",
MIFARE Ultralight is not supported on such device.

Change-Id: I1fb9bcdd2c0759ccf8598c78244a0e72e397c035
Use a longer test string DO NOT MERGE

Our screen is large enough to show the string you have provided,
so we have to change the string length to pass the cts test.
Additionally, we can also pass the cts test by enlarging the font size.

Signed-off-by: xiaoming Liu <liuxm2@lenovo.com>
Change-Id: I3fd9201462540ef296c72b67b40a71fa117b8ce1
Handle devices with no telephony. DO NOT MERGE

If the device has no telephony feature, this case will fail.
It doesn't check if the device has such feature or not.
The fix is to check the feature first.

Change-Id: I06b1d3fcfde3e471bce3eb4571bcb693424e9345
Merge "Use a longer test string DO NOT MERGE" into jb-dev
Merge "Handle devices with no telephony. DO NOT MERGE" into jb-dev
DO NOT MERGE CTS Holo: Enlarge the threshold from 1 to 2

Optimized Skia implementation may have 1 bit difference with the accurate result,
which is same as Google's default Skia implementation.
But other vendor may choose different optimization with Google's,
so the maximum difference between Google's C optimization and other vendor's optimization may be 2

Change-Id: Iac19e6b8bd53b3932ebb38c12c4b795ee31316f8
Signed-off-by: Xu Ziyi <zyxu@marvell.com>
Merge "DO NOT MERGE CTS Holo: Enlarge the threshold from 1 to 2" into jb-dev
DO NOT MERGE Fix LocationManagerTest#testExitProximity

- delay 2 seconds before updating location. For proximity alert,
location update in less than 1s will be neglected since JellyBean.

issue 35181
Change-Id: Iac1d902ce4185457b57d4c38b936794fd47c3d19
DO NOT MERGE Fix assertion to use complete load check rather than one flag.

 Bug 6419879

Change-Id: I60c5701925dc1ce803879d0491dd8aac92a6759d
Merge "DO NOT MERGE Fix assertion to use complete load check rather than one flag." into jb-dev
Merge "DO NOT MERGE Fix LocationManagerTest#testExitProximity" into jb-dev
close file stuffs  before deleted in teardown

- FileStream and MediaMetadataRetriever

Change-Id: I26e903254069e8a875806420f102e5a7078dbd60
Merge "close file stuffs  before deleted in teardown" into jb-dev
Remove external storage enforcement test.

This test only works on engineering builds, and current default is
for permission to be unenforced.  The unenforced test still remains.

Bug: 6721185
Change-Id: I13bd91d0b5f7de3d2abf63c96a7e662ceda1da4b
Give a size for image so test doesn't have to wait for the load.

 Bug 6299115

Change-Id: I3c226c94bd2aa2cbbeb635981b70f43649f22529
Fixing some flakiness in the CTS accessibility tests.

1. Imporved synchronization while waiting for async
   accessibility events.

2. Updated the gloabl action tests to avoid leading
   the device in a state that causes subsequent tests
   to fail.

bug:6301007
bug:6339712
bug:6467998
bug:6468754
bug:6339616
bug:6339713
bug:6468136

Change-Id: I1657f6089ef07c40051b69a0d86d09dfdb4c2307
Merge "Remove external storage enforcement test." into jb-dev