commit 5adc858b0f19003194b061946b00d8a2fd3f666e
author Santos Cordon <santoscordon@google.com> Mon Oct 06 23:42:52 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Oct 06 23:42:52 2014 +0000
tree 36572661e61edd0bdb807c932dd00e37868c89d8
parent 72d271c4fdb6e497cf374ac1bfd1e615393fc4b2
parent 4f50f8e29d7479351ec344ec592686708ff01055

Merge "Dont clear serviceConnections on subsequent bind() calls." into lmp-dev

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

diff --git a/src/com/android/server/telecom/InCallController.java b/src/com/android/server/telecom/InCallController.java
index 2dc30da..6621c7c 100644
--- a/src/com/android/server/telecom/InCallController.java
+++ b/src/com/android/server/telecom/InCallController.java
@@ -261,8 +261,6 @@
     private void bind() {
         ThreadUtil.checkOnMainThread();
         if (mInCallServices.isEmpty()) {
-            mServiceConnections.clear();
-
             PackageManager packageManager = mContext.getPackageManager();
             Intent serviceIntent = new Intent(InCallService.SERVICE_INTERFACE);
 
@@ -289,11 +287,14 @@
                         continue;
                     }
 
-                    Log.i(this, "Attempting to bind to InCall " + serviceInfo.packageName);
                     InCallServiceConnection inCallServiceConnection = new InCallServiceConnection();
                     ComponentName componentName = new ComponentName(serviceInfo.packageName,
                             serviceInfo.name);
 
+                    Log.i(this, "Attempting to bind to InCall %s, is dupe? %b ",
+                            serviceInfo.packageName,
+                            mServiceConnections.containsKey(componentName));
+
                     if (!mServiceConnections.containsKey(componentName)) {
                         Intent intent = new Intent(InCallService.SERVICE_INTERFACE);
                         intent.setComponent(componentName);