am 17dbb7f5: Merge "Change TextView break strategy to meet Android Wear configuration." into marshmallow-cts-dev am: 109a23c47c
* commit '17dbb7f5f0e1ad7d93c3e81f171caceadd71095c':
Change TextView break strategy to meet Android Wear configuration.
diff --git a/tests/expectations/knownfailures.txt b/tests/expectations/knownfailures.txt
index 2cb99c4..5165544 100644
--- a/tests/expectations/knownfailures.txt
+++ b/tests/expectations/knownfailures.txt
@@ -16,6 +16,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",
@@ -230,23 +237,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 1378bdb..c4dd026 100644
--- a/tests/tests/print/src/android/print/cts/BasePrintTest.java
+++ b/tests/tests/print/src/android/print/cts/BasePrintTest.java
@@ -549,6 +549,7 @@
}
protected boolean supportsPrinting() {
- return getActivity().getPackageManager().hasSystemFeature(PackageManager.FEATURE_PRINTING);
+ return getInstrumentation().getContext().getPackageManager()
+ .hasSystemFeature(PackageManager.FEATURE_PRINTING);
}
}