summaryrefslogtreecommitdiffstats
path: root/telecomm/java/android
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 /telecomm/java/android
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 'telecomm/java/android')
-rw-r--r--telecomm/java/android/telecom/TelecomManager.java2
1 files changed, 0 insertions, 2 deletions
diff --git a/telecomm/java/android/telecom/TelecomManager.java b/telecomm/java/android/telecom/TelecomManager.java
index 145c993..4cf741d 100644
--- a/telecomm/java/android/telecom/TelecomManager.java
+++ b/telecomm/java/android/telecom/TelecomManager.java
@@ -69,9 +69,7 @@ public class TelecomManager {
/**
* The {@link android.content.Intent} action used to configure a
* {@link android.telecom.ConnectionService}.
- * @hide
*/
- @SystemApi
public static final String ACTION_CONNECTION_SERVICE_CONFIGURE =
"android.telecom.action.CONNECTION_SERVICE_CONFIGURE";