commit f1082805fb45dae866c7e1d1f405a567cac86650
author Evan Charlton <evanc@google.com> Mon Oct 27 17:08:41 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Oct 27 17:08:42 2014 +0000
tree f54faa520e07a959ec97e0aa1aeebbf4fa1cc991
parent 1813bdd2744791ef007620d85407bb22ea4ed13a
parent 116549bfd182fab4a5b8f6c314838fa9648a41f2

Merge "Use the public API permissions" into lmp-mr1-dev

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ebcf697..88e90ae 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -38,18 +38,6 @@
     <uses-permission android:name="android.permission.MODIFY_PHONE_STATE" />
     <uses-permission android:name="android.permission.BROADCAST_CALLLOG_INFO" />
 
-    <!-- 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="com.android.server.telecom.permission.REGISTER_PROVIDER_OR_SUBSCRIPTION"
-            android:label="Register CALL_PROVIDER or SIM_SUBSCRIPTION PhoneAccount"
-            android:protectionLevel="signature"/>
-
-    <permission
-            android:name="com.android.server.telecom.permission.REGISTER_CONNECTION_MANAGER"
-            android:label="Register CONNECTION_MANAGER PhoneAccount"
-            android:protectionLevel="signature"/>
-
     <permission
             android:name="android.permission.BROADCAST_CALLLOG_INFO"
             android:label="Broadcast the call type/duration information"

src/com/android/server/telecom/TelecomServiceImpl.java

diff --git a/src/com/android/server/telecom/TelecomServiceImpl.java b/src/com/android/server/telecom/TelecomServiceImpl.java
index d58bf7a..95a7e75 100644
--- a/src/com/android/server/telecom/TelecomServiceImpl.java
+++ b/src/com/android/server/telecom/TelecomServiceImpl.java
@@ -51,9 +51,9 @@
  */
 public class TelecomServiceImpl extends ITelecomService.Stub {
     private static final String REGISTER_PROVIDER_OR_SUBSCRIPTION =
-            "com.android.server.telecom.permission.REGISTER_PROVIDER_OR_SUBSCRIPTION";
+            android.Manifest.permission.REGISTER_PROVIDER_OR_SUBSCRIPTION;
     private static final String REGISTER_CONNECTION_MANAGER =
-            "com.android.server.telecom.permission.REGISTER_CONNECTION_MANAGER";
+            android.Manifest.permission.REGISTER_CONNECTION_MANAGER;
 
     /** The context. */
     private Context mContext;