commit fae0efd9745da43764b527ea130ef1bf7c362811
author Yorke Lee <yorkelee@google.com> Tue Oct 07 00:55:00 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 07 00:55:01 2014 +0000
tree 8be14f5119f5d9f670c54faabe2ce6f68011a00d
parent 81db23b811498a89bf0b4beb1afd022fef63e772
parent 9250e5fa9987c3ab80e11e1955657055f5866539

Merge "Add ability to add sim-initiated MO call to UI (3/4)" into lmp-dev

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

diff --git a/src/com/android/server/telecom/CallActivity.java b/src/com/android/server/telecom/CallActivity.java
index 69da7e4..07f66e4 100644
--- a/src/com/android/server/telecom/CallActivity.java
+++ b/src/com/android/server/telecom/CallActivity.java
@@ -156,8 +156,7 @@
      */
     private boolean sendBroadcastToReceiver(Intent intent, boolean incoming) {
         intent.putExtra(CallReceiver.KEY_IS_INCOMING_CALL, incoming);
-        // Clear out any flags set previously since we don't need it for the broadcast.
-        intent.setFlags(0);
+        intent.setFlags(Intent.FLAG_RECEIVER_FOREGROUND);
         intent.setClass(this, CallReceiver.class);
         Log.d(this, "Sending broadcast as user to CallReceiver- isIncoming: %s", incoming);
         sendBroadcastAsUser(intent, UserHandle.OWNER);

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);