commit 8e3c770888d0c587fdac8a8f5878e23fc59d7700
author Chiao Cheng <chiaocheng@google.com> Thu Aug 29 20:59:46 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Aug 29 20:59:46 2013 +0000
tree 8c633bcefaef7b7f21645eaa60d2a6c8bc79c949
parent 576472debf35a0d63f9507541150d16728e142f3
parent d38eebcd68a92b7ba1ebb1b79530b98b594e04c2

Merge "Fix potential out of order callbacks." into klp-dev

src/com/android/phone/CallHandlerServiceProxy.java

diff --git a/src/com/android/phone/CallHandlerServiceProxy.java b/src/com/android/phone/CallHandlerServiceProxy.java
index d13aa75..b1a3345 100644
--- a/src/com/android/phone/CallHandlerServiceProxy.java
+++ b/src/com/android/phone/CallHandlerServiceProxy.java
@@ -85,7 +85,9 @@
         mAudioRouter.addAudioModeListener(this);
         mCallModeler.addListener(this);
 
-        setupServiceConnection();
+        if (PhoneGlobals.sVoiceCapable) {
+            setupServiceConnection();
+        }
     }
 
     @Override
@@ -251,8 +253,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(