summaryrefslogtreecommitdiffstats
path: root/telecomm
diff options
context:
space:
mode:
authorEvan Charlton <evanc@google.com>2014-09-05 15:41:23 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-09-05 15:41:24 +0000
commit235c159633acfd40d36425f731e3b069d3d04c50 (patch)
tree521b7d6192755aa5ace2226720ef13ea54139f66 /telecomm
parentf363bda252efe4201c60c0b042fee9e98bf4d48e (diff)
parenteb0a8d562122d67a528286c595395f90ac2720cd (diff)
downloadframeworks_base-235c159633acfd40d36425f731e3b069d3d04c50.zip
frameworks_base-235c159633acfd40d36425f731e3b069d3d04c50.tar.gz
frameworks_base-235c159633acfd40d36425f731e3b069d3d04c50.tar.bz2
Merge "Add a way to fetch the current connection manager" into lmp-dev
Diffstat (limited to 'telecomm')
-rw-r--r--telecomm/java/android/telecomm/TelecommManager.java13
1 files changed, 12 insertions, 1 deletions
diff --git a/telecomm/java/android/telecomm/TelecommManager.java b/telecomm/java/android/telecomm/TelecommManager.java
index 5486be1..d5a06f5 100644
--- a/telecomm/java/android/telecomm/TelecommManager.java
+++ b/telecomm/java/android/telecomm/TelecommManager.java
@@ -390,6 +390,17 @@ public class TelecommManager {
}
/**
+ * Returns the current connection manager. Apps must be prepared for this method to return
+ * {@code null}, indicating that there currently exists no user-chosen default
+ * {@code PhoneAccount}.
+ *
+ * @return The phone account handle of the current connection manager.
+ */
+ public PhoneAccountHandle getConnectionManager() {
+ return getSimCallManager();
+ }
+
+ /**
* Returns a list of {@link PhoneAccountHandle}s which can be used to make and receive phone
* calls which support the specified URI scheme.
* <P>
@@ -724,4 +735,4 @@ public class TelecommManager {
}
return isConnected;
}
-} \ No newline at end of file
+}