Add test for security bug 32873375 am: de3cc43121 am: 462ec3e381 am: cfa4302517
am: 50ba7f87b8
Change-Id: I377f9f8b8478a413d7e6015f974e8936c9cd516e
diff --git a/apps/CtsVerifier/AndroidManifest.xml b/apps/CtsVerifier/AndroidManifest.xml
index cf5d602..fd08889 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="6.0_r201602s">
+ android:versionName="6.0_r2">
<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="23"/>
diff --git a/tests/expectations/knownfailures.txt b/tests/expectations/knownfailures.txt
index 445e4c8..64816b4 100644
--- a/tests/expectations/knownfailures.txt
+++ b/tests/expectations/knownfailures.txt
@@ -23,6 +23,13 @@
bug: 17536113
},
{
+ description: "the ConnectivityConstraintTest are not yet stable",
+ names: [
+ "android.jobscheduler.cts.ConnectivityConstraintTest"
+ ],
+ bug: 18117279
+},
+{
description: "tests a fragile by nature as they rely on hardcoded behavior",
names: [
"android.accessibilityservice.cts.AccessibilityTextTraversalTest#testActionNextAndPreviousAtGranularityPageOverText",
@@ -209,23 +216,6 @@
bug: 17989532
},
{
- description: "The new AE/AF trigger tests are not yet passing on all devices",
- names: [
- "android.hardware.camera2.cts.RobustnessTest#testBasicTriggerSequence",
- "android.hardware.camera2.cts.RobustnessTest#testSimultaneousTriggers",
- "android.hardware.camera2.cts.RobustnessTest#testAfThenAeTrigger",
- "android.hardware.camera2.cts.RobustnessTest#testAeThenAfTrigger"
- ],
- bug: 22180706
-},
-{
- description: "The new create session test is not yet passing on all devices",
- names: [
- "android.hardware.camera2.cts.CameraDeviceTest#testCreateSessions"
- ],
- bug: 22092756
-},
-{
description: "The new long processing test is not yet passing on all devices",
names: [
"android.hardware.camera2.cts.ImageReaderTest#testLongProcessingRepeatingRaw",
diff --git a/tests/tests/print/src/android/print/cts/BasePrintTest.java b/tests/tests/print/src/android/print/cts/BasePrintTest.java
index e67943d..ea61806 100755
--- a/tests/tests/print/src/android/print/cts/BasePrintTest.java
+++ b/tests/tests/print/src/android/print/cts/BasePrintTest.java
@@ -567,7 +567,7 @@
}
protected boolean supportsPrinting() {
- return getInstrumentation().getContext().getPackageManager().hasSystemFeature(
- PackageManager.FEATURE_PRINTING);
+ return getInstrumentation().getContext().getPackageManager()
+ .hasSystemFeature(PackageManager.FEATURE_PRINTING);
}
}
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 e4c5b02..66a4562 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 = "6.0_r201704s";
+ public static final String CTS_BUILD_VERSION = "6.0_r3";
public static final String CTS_PACKAGE = "com.android.cts.tradefed.testtype";
/**