commit 6afb77c4e0c5069cd73449a0c6920cc4ee07f2fd
author Zach Johnson <zachoverflow@google.com> Wed May 13 16:42:40 2015 -0700
committer Zach Johnson <zachoverflow@google.com> Thu May 14 15:13:49 2015 -0700
tree 4449731487ed96d05abc976606d22c00820f9cdf
parent 354185b938e25de0d13a218f415c5d1d2fb0f649

Declare the unified BIND_CARRIER_SERVICES permission

Remove the BIND_CARRIER_CONFIG_SERVICE permission since
it hasn't shipped yet. Still keep the BIND_CARRIER_MESSAGING_SERVICE
permission around until a reasonable deprecation timeframe is over.

b/21165906

Change-Id: I35d206561ebb7ca9dbbcce670069c5a1fb7be15c

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 3c846a4..f8c737f 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -98,7 +98,8 @@
     <uses-permission android:name="android.permission.DUMP" />
     <uses-permission android:name="android.permission.REGISTER_CALL_PROVIDER" />
     <uses-permission android:name="android.permission.REGISTER_SIM_SUBSCRIPTION" />
-    <uses-permission android:name="android.permission.BIND_CARRIER_CONFIG_SERVICE" />
+    <uses-permission android:name="android.permission.BIND_CARRIER_SERVICES" />
+    <!-- BIND_CARRIER_MESSAGING_SERVICE has been deprecated in favor of BIND_CARRIER_SERVICES. -->
     <uses-permission android:name="android.permission.BIND_CARRIER_MESSAGING_SERVICE" />
     <uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />
     <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />