Merge "Fixed numbering of list items for Projection Scrolling List Test" into lmp-sprout-dev
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/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"