Merge "Increased a CTS test timeout from 5 sec to 30 sec. This test was already flaky on L phones and tablets, but it almost never passed on Clockwork Coral (L) devices. Now it passes. Bug: 18040863 Bug: 18533405" into lmp-sprout-dev
diff --git a/apps/CtsVerifier/AndroidManifest.xml b/apps/CtsVerifier/AndroidManifest.xml
index 563a65e..f61375a 100644
--- a/apps/CtsVerifier/AndroidManifest.xml
+++ b/apps/CtsVerifier/AndroidManifest.xml
@@ -18,7 +18,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.cts.verifier"
android:versionCode="5"
- android:versionName="5.0_r1.93">
+ android:versionName="5.0_r1.94">
<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="21"/>
@@ -1120,6 +1120,8 @@
<category android:name="android.cts.intent.category.MANUAL_TEST" />
</intent-filter>
<meta-data android:name="test_category" android:value="@string/test_category_notifications" />
+ <meta-data android:name="test_excluded_features"
+ android:value="android.hardware.type.watch" />
</activity>
<activity android:name=".notifications.PackagePriorityVerifierActivity"
@@ -1129,6 +1131,8 @@
<category android:name="android.cts.intent.category.MANUAL_TEST" />
</intent-filter>
<meta-data android:name="test_category" android:value="@string/test_category_notifications" />
+ <meta-data android:name="test_excluded_features"
+ android:value="android.hardware.type.watch" />
</activity>
<service android:name=".notifications.MockListener"
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/features/FeatureSummaryActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/features/FeatureSummaryActivity.java
index c0895d7..105e92b 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/features/FeatureSummaryActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/features/FeatureSummaryActivity.java
@@ -220,6 +220,9 @@
new Feature(PackageManager.FEATURE_SENSOR_RELATIVE_HUMIDITY, false),
new Feature(PackageManager.FEATURE_VERIFIED_BOOT, false),
+ // Features explicitly made optional in L
+ new Feature("PackageManager.FEATURE_LOCATION_NETWORK", false),
+
// New hidden features in L
new Feature("android.hardware.ethernet", false),
new Feature("android.hardware.hdmi.cec", false),
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/projection/list/ListPresentation.java b/apps/CtsVerifier/src/com/android/cts/verifier/projection/list/ListPresentation.java
index 5dddf5c..46abaaa 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/projection/list/ListPresentation.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/projection/list/ListPresentation.java
@@ -50,7 +50,7 @@
setContentView(view);
for (int i = 0; i < NUM_ITEMS; ++i) {
- mItemList.add("Item #" + 1 + i);
+ mItemList.add("Item #" + (1 + i));
}
ListView listView = (ListView) view.findViewById(R.id.pla_list);
diff --git a/tests/expectations/knownfailures.txt b/tests/expectations/knownfailures.txt
index 96706cb..3574900 100644
--- a/tests/expectations/knownfailures.txt
+++ b/tests/expectations/knownfailures.txt
@@ -22,6 +22,23 @@
bug: 17595050
},
{
+ description: "the SSLCertificateSocketFactoryTest often fails because of lack of live internet or short timeout, it should be refactored to do a local server testing",
+ names: [
+ "android.net.cts.SSLCertificateSocketFactoryTest#testCreateSocket",
+ "android.net.cts.SSLCertificateSocketFactoryTest#test_createSocket_bind",
+ "android.net.cts.SSLCertificateSocketFactoryTest#test_createSocket_simple",
+ "android.net.cts.SSLCertificateSocketFactoryTest#test_createSocket_wrapping"
+ ],
+ bug: 18682315
+},
+{
+ description: "the test result are too much dependent on live-internet connection, which for some devices might not exist",
+ names: [
+ "android.net.wifi.cts.NsdManagerTest#testAndroidTestCaseSetupProperly"
+ ],
+ bug: 18680089
+},
+{
description: "AudioPolicyBinder tests are not yet robust enough",
names: [
"android.security.cts.AudioPolicyBinderTest"
diff --git a/tools/tradefed-host/src/com/android/cts/tradefed/build/CtsBuildProvider.java b/tools/tradefed-host/src/com/android/cts/tradefed/build/CtsBuildProvider.java
index 42724e5..7e8a19e 100644
--- a/tools/tradefed-host/src/com/android/cts/tradefed/build/CtsBuildProvider.java
+++ b/tools/tradefed-host/src/com/android/cts/tradefed/build/CtsBuildProvider.java
@@ -31,7 +31,7 @@
@Option(name="cts-install-path", description="the path to the cts installation to use")
private String mCtsRootDirPath = System.getProperty("CTS_ROOT");
- public static final String CTS_BUILD_VERSION = "5.0_r1.93";
+ public static final String CTS_BUILD_VERSION = "5.0_r1.94";
/**
* {@inheritDoc}