commit 9a855503a9b895b8859a22b060e9e2a3801dc125
author Tony Mak <tonymak@google.com> Mon May 09 12:12:41 2016 +0100
committer The Android Automerger <android-build@google.com> Mon May 09 16:44:22 2016 -0700
tree a9b884c331509cf63851e5d52140eb0cb0a424f5
parent cde1faad8294b8813cc5d7cd53028a69e59bc07c

Should not run telecom test with device that have no telephony support

Bug: 28652905

Change-Id: I33955e87e6d67de562288726cfa8f36f23030377

hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/ManagedProfileTest.java

diff --git a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/ManagedProfileTest.java b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/ManagedProfileTest.java
index db61f82..eb1c44b 100644
--- a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/ManagedProfileTest.java
+++ b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/ManagedProfileTest.java
@@ -64,6 +64,8 @@
     private static final String FEATURE_BLUETOOTH = "android.hardware.bluetooth";
     private static final String FEATURE_CAMERA = "android.hardware.camera";
     private static final String FEATURE_WIFI = "android.hardware.wifi";
+    private static final String FEATURE_TELEPHONY = "android.hardware.telephony";
+    private static final String FEATURE_CONNECTION_SERVICE = "android.software.connectionservice";
 
     private static final String ADD_RESTRICTION_COMMAND = "add-restriction";
 
@@ -621,6 +623,9 @@
         if (!mHasFeature) {
             return;
         }
+        if (!shouldRunTelecomTest()) {
+            return;
+        }
         try {
             // Register phone account in parent user.
             assertTrue(runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".PhoneAccountTest",
@@ -658,6 +663,9 @@
         if (!mHasFeature) {
             return;
         }
+        if (!shouldRunTelecomTest()) {
+            return;
+        }
         // Place a outgoing call through work phone account using TelecomManager and verify the
         // call is inserted properly.
         assertTrue(runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".PhoneAccountTest",
@@ -769,6 +777,10 @@
                 mProfileUserId));
     }
 
+    private boolean shouldRunTelecomTest() throws DeviceNotAvailableException {
+        return hasDeviceFeature(FEATURE_TELEPHONY) && hasDeviceFeature(FEATURE_CONNECTION_SERVICE);
+    }
+
     private void runManagedContactsTest(Callable<Void> callable) throws Exception {
         if (!mHasFeature) {
             return;