commit 6d812117318b5ccccf81cea9f0b245046d35813e
author Android Merger <noreply-android-build-merger@google.com> Fri Jun 08 00:06:35 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jun 08 00:06:35 2018 +0000
tree 163f0adc474dd60c67b4e01c7ecff5fe993a9e7b
parent 54fef6390ce7fc321f9f82e4269f818197d3707e
parent ea1959cf0b206105dfb567a6eb5d3445a586d195

Merge "Merge "Merge "Merge "Fix for testOnCannedTextResponsesLoaded" into marshmallow-cts-dev am: 3f7a9a92dd" into nougat-cts-dev am: 728b6f4dc7" into nougat-mr1-cts-dev am: 7113d1df86" into oreo-cts-dev

tests/tests/telecom/src/android/telecom/cts/ExtendedInCallServiceTest.java

diff --git a/tests/tests/telecom/src/android/telecom/cts/ExtendedInCallServiceTest.java b/tests/tests/telecom/src/android/telecom/cts/ExtendedInCallServiceTest.java
index ca12b34..a87b943 100644
--- a/tests/tests/telecom/src/android/telecom/cts/ExtendedInCallServiceTest.java
+++ b/tests/tests/telecom/src/android/telecom/cts/ExtendedInCallServiceTest.java
@@ -31,6 +31,7 @@
 import android.telecom.InCallService;
 import android.telecom.TelecomManager;
 import android.telecom.VideoProfile;
+import android.telephony.TelephonyManager;
 
 import java.util.List;
 
@@ -574,6 +575,11 @@
             return;
         }
 
+        TelephonyManager tm = (TelephonyManager) mContext.getSystemService(Context.TELEPHONY_SERVICE);
+        if (tm != null && !tm.isSmsCapable()) {
+            return ;
+        }
+
         addAndVerifyNewIncomingCall(createTestNumber(), null);
         verifyConnectionForIncomingCall();
         final MockInCallService inCallService = mInCallCallbacks.getService();