commit 2ef87ee728e7ac76c9199f0b75c96835991c0ceb
author Santos Cordon <santoscordon@google.com> Fri Oct 31 12:39:44 2014 -0700
committer Santos Cordon <santoscordon@google.com> Fri Oct 31 14:44:30 2014 -0700
tree 17974d09a864d7fc143a367d888125f522f52e04
parent 38b00a63c9f637bbe43b6ea3785c9577c43dbac5

Split Telecom PhoneAccount registration permissions.

Bug: 18106506
Change-Id: Ic825b44c2dc42709073a3990f6a7ca8e372025e9

core/res/AndroidManifest.xml

diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 8e0cd52..6f2a06b 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -1269,13 +1269,24 @@
         android:description="@string/permdesc_use_sip"
         android:label="@string/permlab_use_sip" />
 
-    <!-- Protects the ability to register any PhoneAccount with a capability flags of either
-         PhoneAccount#CAPABILITY_CALL_PROVIDER or PhoneAccount#CAPABILITY_SIM_SUBSCRIPTION. -->
-    <permission android:name="android.permission.REGISTER_PROVIDER_OR_SUBSCRIPTION"
+    <!-- Protects the ability to register any PhoneAccount with
+         PhoneAccount#CAPABILITY_SIM_SUBSCRIPTION. This capability indicates that the PhoneAccount
+         corresponds to a device SIM. -->
+    <permission android:name="android.permission.REGISTER_SIM_SUBSCRIPTION"
         android:permissionGroup="android.permission-group.PHONE_CALLS"
-        android:description="@string/permdesc_register_provider"
-        android:label="@string/permlab_register_provider" />
+        android:protectionLevel="system|signature"
+        android:description="@string/permdesc_register_sim_subscription"
+        android:label="@string/permlab_register_sim_subscription" />
 
+    <!-- Protects the ability to register any PhoneAccount with
+         PhoneAccount#CAPABILITY_CALL_PROVIDER. -->
+    <permission android:name="android.permission.REGISTER_CALL_PROVIDER"
+        android:permissionGroup="android.permission-group.PHONE_CALLS"
+        android:description="@string/permdesc_register_call_provider"
+        android:label="@string/permlab_register_call_provider" />
+
+    <!-- Protects the ability to register any PhoneAccount with
+         PhoneAccount#CAPABILITY_CONNECTION_MANAGER -->
     <permission android:name="android.permission.REGISTER_CONNECTION_MANAGER"
         android:permissionGroup="android.permission-group.PHONE_CALLS"
         android:description="@string/permdesc_connection_manager"