Merge \"CtsVerifier: Better skip of dynamic sensor tests\" into nyc-dev
am: fbb7aef358
Change-Id: Ib643b2c28086079120799c47ffac61a22be7d835
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/sensors/DynamicSensorDiscoveryTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/DynamicSensorDiscoveryTestActivity.java
index d910a9d..dd9c752 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/sensors/DynamicSensorDiscoveryTestActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/DynamicSensorDiscoveryTestActivity.java
@@ -63,6 +63,16 @@
}
mFeatureSupported = mSensorManager.isDynamicSensorDiscoverySupported();
+ try {
+ featureSupportedOrSkip();
+ } catch (SensorTestStateNotSupportedException e) {
+ // This device doesn't support dynamic sensors. So we won't
+ // be running any of the tests, and really don't want to
+ // confuse the user by telling them they need to hoook one up.
+ // TODO(b/29606675): This is pretty hack, and should have
+ // a better overall approach.
+ return;
+ }
showUserMessage("This test will requires the user to connect an external sensor (" +
"physical or simulated) and then disconnect it.");
waitForUserToContinue();
