commit 1c914532d75031a0d97776d9c75d3850bef671c0
author Hall Liu <hallliu@google.com> Mon Feb 26 21:05:11 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Feb 26 21:05:11 2018 +0000
tree 88a1af6a43ef2c53c22ff252cbf55942788bddff
parent 875f086bee61a5b3f8beaa1d9280fa1634c7844a
parent a49d82f1201ee0207d525a02d5534d5041bbb7f5

Merge "Fix RTT CTS tests"

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

diff --git a/tests/tests/telecom/src/android/telecom/cts/RttOperationsTest.java b/tests/tests/telecom/src/android/telecom/cts/RttOperationsTest.java
index 588aa64..1b29a56 100644
--- a/tests/tests/telecom/src/android/telecom/cts/RttOperationsTest.java
+++ b/tests/tests/telecom/src/android/telecom/cts/RttOperationsTest.java
@@ -311,7 +311,12 @@
     }
 
     private boolean getRttMasterSwitch() throws Exception {
-        return Integer.valueOf(TestUtils.executeShellCommand(
-                getInstrumentation(), "settings get system rtt_calling_mode")) == 1;
+        try {
+            return Integer.valueOf(TestUtils.executeShellCommand(
+                    getInstrumentation(), "settings get system rtt_calling_mode")) == 1;
+        } catch (NumberFormatException e) {
+            // If the setting hasn't been set yet, assume it's off
+            return false;
+        }
     }
 }