diff --git a/src/com/android/phone/CallHandlerServiceProxy.java b/src/com/android/phone/CallHandlerServiceProxy.java
index 8a8e99d..624a086 100644
--- a/src/com/android/phone/CallHandlerServiceProxy.java
+++ b/src/com/android/phone/CallHandlerServiceProxy.java
@@ -84,7 +84,9 @@
         mAudioRouter.addAudioModeListener(this);
         mCallModeler.addListener(this);
 
-        setupServiceConnection();
+        if (PhoneGlobals.sVoiceCapable) {
+            setupServiceConnection();
+        }
     }
 
     @Override
@@ -250,8 +252,6 @@
     private void setupServiceConnection() {
         synchronized (mServiceAndQueueLock) {
             if (mCallHandlerServiceGuarded == null) {
-
-
                 final Intent serviceIntent = new Intent(ICallHandlerService.class.getName());
                 final ComponentName component = new ComponentName(mContext.getResources().getString(
                         R.string.incall_ui_default_package), mContext.getResources().getString(