summaryrefslogtreecommitdiffstats
path: root/telecomm/java/android
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2015-05-14 02:06:52 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-05-14 02:06:54 +0000
commitad0bfe3ae2f056a568c6256614079e6f31f5d542 (patch)
tree929aedcba97060cf3c33d637594ea787824577f6 /telecomm/java/android
parent857c3019bac34bbabaa8d5ebb4ab0047ca07cfc5 (diff)
parent249c12e7b88fc7799c1b5e1eaf72429fc6aa56a2 (diff)
downloadframeworks_base-ad0bfe3ae2f056a568c6256614079e6f31f5d542.zip
frameworks_base-ad0bfe3ae2f056a568c6256614079e6f31f5d542.tar.gz
frameworks_base-ad0bfe3ae2f056a568c6256614079e6f31f5d542.tar.bz2
Merge "Add BIND_TELECOM_CONNECTION_SERVICE permission" into mnc-dev
Diffstat (limited to 'telecomm/java/android')
-rw-r--r--telecomm/java/android/telecom/ConnectionService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/telecomm/java/android/telecom/ConnectionService.java b/telecomm/java/android/telecom/ConnectionService.java
index 6b8ca69..199100b 100644
--- a/telecomm/java/android/telecom/ConnectionService.java
+++ b/telecomm/java/android/telecom/ConnectionService.java
@@ -50,7 +50,7 @@ import java.util.concurrent.ConcurrentHashMap;
* <pre>
* &lt;service android:name="com.example.package.MyConnectionService"
* android:label="@string/some_label_for_my_connection_service"
- * android:permission="android.permission.BIND_CONNECTION_SERVICE"&gt;
+ * android:permission="android.permission.BIND_TELECOM_CONNECTION_SERVICE"&gt;
* &lt;intent-filter&gt;
* &lt;action android:name="android.telecom.ConnectionService" /&gt;
* &lt;/intent-filter&gt;