commit 7cdd04c8ff9e3020a32a649f0e4887ffce0162cb
author Yorke Lee <yorkelee@google.com> Mon Nov 17 17:52:13 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Nov 17 17:52:13 2014 +0000
tree 2f8d0da43c99e81d43b23719d086a7e3307cedc9
parent 7878b0ce24c789bc042fe41e6d4fdcd31640b188
parent 8efc0323cc51ed8536f2dfa8349c7216a7664413

Merge "Create default InCallService with Context.BIND_IMPORTANT" into lmp-mr1-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 700bbd6..9498d4c 100644
--- a/src/com/android/server/telecom/InCallController.java
+++ b/src/com/android/server/telecom/InCallController.java
@@ -316,8 +316,11 @@
                         Intent intent = new Intent(InCallService.SERVICE_INTERFACE);
                         intent.setComponent(componentName);
 
-                        if (mContext.bindServiceAsUser(intent, inCallServiceConnection,
-                                Context.BIND_AUTO_CREATE, UserHandle.CURRENT)) {
+                        final int bindFlags = mInCallComponentName.equals(componentName)
+                                ? Context.BIND_AUTO_CREATE | Context.BIND_IMPORTANT
+                                : Context.BIND_AUTO_CREATE;
+                        if (mContext.bindServiceAsUser(intent, inCallServiceConnection, bindFlags,
+                                UserHandle.CURRENT)) {
                             mServiceConnections.put(componentName, inCallServiceConnection);
                         }
                     }