1 files changed, 19 insertions, 4 deletions
diff --git a/src/com/android/incallui/InCallServiceImpl.java b/src/com/android/incallui/InCallServiceImpl.java
index dfec2622..39aaf931 100644
--- a/src/com/android/incallui/InCallServiceImpl.java
+++ b/src/com/android/incallui/InCallServiceImpl.java
@@ -16,6 +16,8 @@
 
 package com.android.incallui;
 
+import android.content.Intent;
+import android.os.IBinder;
 import android.telecom.InCallService;
 import android.telecom.Phone;
 
@@ -34,10 +36,6 @@ public class InCallServiceImpl extends InCallService {
         AudioModeProvider.getInstance().setPhone(phone);
         TelecomAdapter.getInstance().setPhone(phone);
         InCallPresenter.getInstance().setPhone(phone);
-        InCallPresenter.getInstance().setUp(
-                getApplicationContext(),
-                CallList.getInstance(),
-                AudioModeProvider.getInstance());
         CallRecorder.getInstance().setUp(getApplicationContext());
         TelecomAdapter.getInstance().setContext(InCallServiceImpl.this);
     }
@@ -53,4 +51,21 @@ public class InCallServiceImpl extends InCallService {
         CallList.getInstance().clearOnDisconnect();
         InCallPresenter.getInstance().tearDown();
     }
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        InCallPresenter.getInstance().setUp(
+                getApplicationContext(),
+                CallList.getInstance(),
+                AudioModeProvider.getInstance());
+        InCallPresenter.getInstance().onServiceBind();
+        InCallPresenter.getInstance().maybeStartRevealAnimation(intent);
+        return super.onBind(intent);
+    }
+
+    @Override
+    public boolean onUnbind(Intent intent) {
+        InCallPresenter.getInstance().onServiceUnbind();
+        return super.onUnbind(intent);
+    }
 }