summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJay Shrauner <shrauner@google.com>2015-04-15 15:51:15 -0700
committerJay Shrauner <shrauner@google.com>2015-04-15 20:49:15 -0700
commite14bbcc0e2ac9f817aff9de4e60202536784fc52 (patch)
treee1904f53ee4b0219958db03c9c2b8a3854ba1048
parent48903511b092feb7502f10f121bdf9b56f26395d (diff)
downloadframeworks_base-e14bbcc0e2ac9f817aff9de4e60202536784fc52.zip
frameworks_base-e14bbcc0e2ac9f817aff9de4e60202536784fc52.tar.gz
frameworks_base-e14bbcc0e2ac9f817aff9de4e60202536784fc52.tar.bz2
DO NOT MERGE Hide getUserSelectedOutgoingPhoneAccount
Bug:20224972 Change-Id: I21528788e38817f77fc68b56e26a33ac726d39e2
-rw-r--r--api/current.txt1
-rw-r--r--api/system-current.txt1
-rw-r--r--telecomm/java/android/telecom/TelecomManager.java1
3 files changed, 1 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt
index 42f0f6d..68f673c 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -28842,7 +28842,6 @@ package android.telecom {
method public java.lang.String getLine1Number(android.telecom.PhoneAccountHandle);
method public android.telecom.PhoneAccount getPhoneAccount(android.telecom.PhoneAccountHandle);
method public android.telecom.PhoneAccountHandle getSimCallManager();
- method public android.telecom.PhoneAccountHandle getUserSelectedOutgoingPhoneAccount();
method public boolean handleMmi(java.lang.String);
method public boolean handleMmi(java.lang.String, android.telecom.PhoneAccountHandle);
method public boolean hasVoiceMailNumber(android.telecom.PhoneAccountHandle);
diff --git a/api/system-current.txt b/api/system-current.txt
index 1e824d5..a6b5d7a 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -30674,7 +30674,6 @@ package android.telecom {
method public java.util.List<android.telecom.PhoneAccountHandle> getPhoneAccountsSupportingScheme(java.lang.String);
method public java.util.List<android.telecom.PhoneAccountHandle> getRegisteredConnectionManagers();
method public android.telecom.PhoneAccountHandle getSimCallManager();
- method public android.telecom.PhoneAccountHandle getUserSelectedOutgoingPhoneAccount();
method public boolean handleMmi(java.lang.String);
method public boolean handleMmi(java.lang.String, android.telecom.PhoneAccountHandle);
method public boolean hasVoiceMailNumber(android.telecom.PhoneAccountHandle);
diff --git a/telecomm/java/android/telecom/TelecomManager.java b/telecomm/java/android/telecom/TelecomManager.java
index 9069ec0..c73f6c2 100644
--- a/telecomm/java/android/telecom/TelecomManager.java
+++ b/telecomm/java/android/telecom/TelecomManager.java
@@ -364,6 +364,7 @@ public class TelecomManager {
* exists no user-chosen default {@code PhoneAccount}.
*
* @return The user outgoing phone account selected by the user.
+ * @hide
*/
public PhoneAccountHandle getUserSelectedOutgoingPhoneAccount() {
try {