commit cf2a3643939b82dec60f1213a0a9890d56158120
author Santos Cordon <santoscordon@google.com> Mon Sep 15 23:19:05 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Sep 15 23:19:06 2014 +0000
tree aac92e5ace47e2e35d634026c66be3b4617e9c0a
parent ee9649b8694f2f6867b99072b8184e998359fc7c
parent e3d8245f09c9d5333ebc7e2d82e684ecfeb6040e

Merge "Remove config variable to disable connection service APIs" into lmp-dev

res/values/config.xml

diff --git a/res/values/config.xml b/res/values/config.xml
index 39923d4..6c6f215 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -43,8 +43,4 @@
          if this package has not registered any accounts, then it will be ignored.
          [DO NOT TRANSLATE] -->
     <string name="default_connection_manager_component" translatable="false"></string>
-
-    <!-- Flag indicating that wi-fi calling through a connection manager is supported.
-         [DO NOT TRANSLATE] -->
-    <bool name="connection_manager_enabled" translatable="false">true</bool>
 </resources>

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

diff --git a/src/com/android/server/telecom/CreateConnectionProcessor.java b/src/com/android/server/telecom/CreateConnectionProcessor.java
index e4c5463..11623b0 100644
--- a/src/com/android/server/telecom/CreateConnectionProcessor.java
+++ b/src/com/android/server/telecom/CreateConnectionProcessor.java
@@ -16,7 +16,6 @@
 
 package com.android.server.telecom;
 
-import android.content.Context;
 import android.telecom.ParcelableConnection;
 import android.telecom.PhoneAccount;
 import android.telecom.PhoneAccountHandle;
@@ -177,12 +176,6 @@
     }
 
     private boolean shouldSetConnectionManager() {
-        Context context = TelecomApp.getInstance();
-        if (!context.getResources().getBoolean(R.bool.connection_manager_enabled)) {
-            // Connection Manager support has been turned off, disregard.
-            return false;
-        }
-
         if (mAttemptRecords.size() == 0) {
             return false;
         }

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

diff --git a/src/com/android/server/telecom/PhoneAccountRegistrar.java b/src/com/android/server/telecom/PhoneAccountRegistrar.java
index 31dd727..ed2ca05 100644
--- a/src/com/android/server/telecom/PhoneAccountRegistrar.java
+++ b/src/com/android/server/telecom/PhoneAccountRegistrar.java
@@ -183,10 +183,6 @@
     }
 
     public void setSimCallManager(PhoneAccountHandle callManager) {
-        if (!isEnabledConnectionManager()) {
-            return;
-        }
-
         if (callManager != null) {
             PhoneAccount callManagerAccount = getPhoneAccount(callManager);
             if (callManagerAccount == null) {
@@ -207,10 +203,6 @@
     }
 
     public PhoneAccountHandle getSimCallManager() {
-        if (!isEnabledConnectionManager()) {
-            return null;
-        }
-
         if (mState.simCallManager != null) {
             if (NO_ACCOUNT_SELECTED.equals(mState.simCallManager)) {
                 return null;
@@ -308,11 +300,8 @@
      * @return The phone account handles.
      */
     public List<PhoneAccountHandle> getConnectionManagerPhoneAccounts() {
-        if (isEnabledConnectionManager()) {
-            return getPhoneAccountHandles(PhoneAccount.CAPABILITY_CONNECTION_MANAGER,
-                    null /* supportedUriScheme */, false /* includeDisabled */);
-        }
-        return Collections.emptyList();
+        return getPhoneAccountHandles(PhoneAccount.CAPABILITY_CONNECTION_MANAGER,
+                null /* supportedUriScheme */, false /* includeDisabled */);
     }
 
     public PhoneAccount getPhoneAccount(PhoneAccountHandle handle) {
@@ -470,10 +459,6 @@
         }
     }
 
-    private boolean isEnabledConnectionManager() {
-        return mContext.getResources().getBoolean(R.bool.connection_manager_enabled);
-    }
-
     /**
      * Determines if the connection service specified by a {@link PhoneAccountHandle} has the
      * {@link Manifest.permission#BIND_CONNECTION_SERVICE} permission.