commit f9e416e5155810f7b1955d01fd605b697cfd597c
author Hall Liu <hallliu@google.com> Wed Nov 23 02:50:57 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Nov 23 02:50:58 2016 +0000
tree 8932cd0325a56c8aebf3ab6a4d91e38d8d812f77
parent e8b11f8edc4a684cab2d11426cfe465e66bdf18a
parent db5dc6e4b2db49f55d0535ae5afad2c7391b9c7f

Merge "Add bluetooth related timeouts adapter methods"

src/com/android/server/telecom/Timeouts.java

diff --git a/src/com/android/server/telecom/Timeouts.java b/src/com/android/server/telecom/Timeouts.java
index 46894dc..0c8e985 100644
--- a/src/com/android/server/telecom/Timeouts.java
+++ b/src/com/android/server/telecom/Timeouts.java
@@ -32,6 +32,14 @@
         public long getCallScreeningTimeoutMillis(ContentResolver cr) {
             return Timeouts.getCallScreeningTimeoutMillis(cr);
         }
+
+        public long getRetryBluetoothConnectAudioBackoffMillis(ContentResolver cr) {
+            return Timeouts.getRetryBluetoothConnectAudioBackoffMillis(cr);
+        }
+
+        public long getBluetoothPendingTimeoutMillis(ContentResolver cr) {
+            return Timeouts.getBluetoothPendingTimeoutMillis(cr);
+        }
     }
 
     /** A prefix to use for all keys so to not clobber the global namespace. */