commit 64883a9430c9245d4884af05787c79ab16ccdb42
author Nancy Chen <nancychen@google.com> Tue Nov 04 00:51:30 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Nov 04 00:51:30 2014 +0000
tree 88a0a44d0784d75ae5fa2ed3db70634c2418bf0d
parent 6e557e0453352823fba703664eb6fcebad9f961a
parent c28f260236e32c2aa47011bcdc557305c988e7e8

Merge "Adn queries for multi-SIM. (3/3)" into lmp-mr1-dev

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 0e20b29..c3a9f9f 100644
--- a/src/com/android/server/telecom/TelecomServiceImpl.java
+++ b/src/com/android/server/telecom/TelecomServiceImpl.java
@@ -51,11 +51,6 @@
  * Implementation of the ITelecom interface.
  */
 public class TelecomServiceImpl extends ITelecomService.Stub {
-    private static final String REGISTER_PROVIDER_OR_SUBSCRIPTION =
-            android.Manifest.permission.REGISTER_PROVIDER_OR_SUBSCRIPTION;
-    private static final String REGISTER_CONNECTION_MANAGER =
-            android.Manifest.permission.REGISTER_CONNECTION_MANAGER;
-
     /** The context. */
     private Context mContext;
 
@@ -304,9 +299,11 @@
         try {
             enforcePhoneAccountModificationForPackage(
                     account.getAccountHandle().getComponentName().getPackageName());
-            if (account.hasCapabilities(PhoneAccount.CAPABILITY_CALL_PROVIDER) ||
-                account.hasCapabilities(PhoneAccount.CAPABILITY_SIM_SUBSCRIPTION)) {
-                enforceRegisterProviderOrSubscriptionPermission();
+            if (account.hasCapabilities(PhoneAccount.CAPABILITY_CALL_PROVIDER)) {
+                enforceRegisterCallProviderPermission();
+            }
+            if (account.hasCapabilities(PhoneAccount.CAPABILITY_SIM_SUBSCRIPTION)) {
+                enforceRegisterSimSubscriptionPermission();
             }
             if (account.hasCapabilities(PhoneAccount.CAPABILITY_CONNECTION_MANAGER)) {
                 enforceRegisterConnectionManagerPermission();
@@ -639,12 +636,16 @@
         enforceFeature(PackageManager.FEATURE_CONNECTION_SERVICE);
     }
 
-    private void enforceRegisterProviderOrSubscriptionPermission() {
-        enforcePermission(REGISTER_PROVIDER_OR_SUBSCRIPTION);
+    private void enforceRegisterCallProviderPermission() {
+        enforcePermission(android.Manifest.permission.REGISTER_CALL_PROVIDER);
+    }
+
+    private void enforceRegisterSimSubscriptionPermission() {
+        enforcePermission(android.Manifest.permission.REGISTER_SIM_SUBSCRIPTION);
     }
 
     private void enforceRegisterConnectionManagerPermission() {
-        enforcePermission(REGISTER_CONNECTION_MANAGER);
+        enforcePermission(android.Manifest.permission.REGISTER_CONNECTION_MANAGER);
     }
 
     private void enforceReadPermission() {

tests/AndroidManifest.xml

diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index 9c09a40..d0cdf5f 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -21,9 +21,9 @@
 
     <!-- Test connection service outgoing video preview. -->
     <uses-permission android:name="android.permission.CAMERA" />
-    <uses-permission
-            android:name="com.android.server.telecom.permission.REGISTER_PROVIDER_OR_SUBSCRIPTION" />
     <uses-permission android:name="android.permission.CONTROL_INCALL_EXPERIENCE" />
+    <uses-permission android:name="android.permission.REGISTER_CALL_PROVIDER" />
+    <uses-permission android:name="android.permission.REGISTER_SIM_SUBSCRIPTION" />
 
     <application android:label="@string/app_name"
                  android:debuggable="true">