summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2015-05-29 00:55:11 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-05-29 00:55:12 +0000
commitd600966c396ce457062795893a7972f3bf2b3617 (patch)
tree0b8681198894f0728ced9c9b9d9a48d0c98b8f8b /api
parentad43220384f2ee1627397cafeac34144dbfda8d6 (diff)
parent656eeb0402179077f55ed1ba2accb292e0653e76 (diff)
downloadframeworks_base-d600966c396ce457062795893a7972f3bf2b3617.zip
frameworks_base-d600966c396ce457062795893a7972f3bf2b3617.tar.gz
frameworks_base-d600966c396ce457062795893a7972f3bf2b3617.tar.bz2
Merge "Make ACTION_CONNECTION_SERVICE_CONFIGURE public" into mnc-dev
Diffstat (limited to 'api')
-rw-r--r--api/current.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index 774374e..39444bc 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -30482,6 +30482,7 @@ package android.telecom {
method public void unregisterPhoneAccount(android.telecom.PhoneAccountHandle);
field public static final java.lang.String ACTION_CHANGE_DEFAULT_DIALER = "android.telecom.action.CHANGE_DEFAULT_DIALER";
field public static final java.lang.String ACTION_CHANGE_PHONE_ACCOUNTS = "android.telecom.action.CHANGE_PHONE_ACCOUNTS";
+ field public static final java.lang.String ACTION_CONNECTION_SERVICE_CONFIGURE = "android.telecom.action.CONNECTION_SERVICE_CONFIGURE";
field public static final java.lang.String ACTION_INCOMING_CALL = "android.telecom.action.INCOMING_CALL";
field public static final java.lang.String ACTION_SHOW_CALL_ACCESSIBILITY_SETTINGS = "android.telecom.action.SHOW_CALL_ACCESSIBILITY_SETTINGS";
field public static final java.lang.String ACTION_SHOW_CALL_SETTINGS = "android.telecom.action.SHOW_CALL_SETTINGS";