1 files changed, 19 insertions, 2 deletions
diff --git a/InCallUI/src/com/android/incallui/InCallService.java b/InCallUI/src/com/android/incallui/InCallService.java
index 5a975b075..113072d61 100644
--- a/InCallUI/src/com/android/incallui/InCallService.java
+++ b/InCallUI/src/com/android/incallui/InCallService.java
@@ -41,11 +41,14 @@ public class InCallService extends Service {
      * {@link CallList} which in turn will trigger UI activity.
      */
     private class InCallServiceBinder extends IInCallService.Stub {
-        /** {@inheritDoc} */
+        /**
+         * TODO(santoscordon): Rename this to setTelecommAdapter.
+         * {@inheritDoc}
+         */
         @Override public void setInCallAdapter(final IInCallAdapter inCallAdapter) {
             mHandler.post(new Runnable() {
                 @Override public void run() {
-                    InCallPresenter.getInstance().setInCallAdapter(inCallAdapter);
+                    InCallPresenter.getInstance().setTelecommAdapter(inCallAdapter);
                 }
             });
         }
@@ -100,4 +103,18 @@ public class InCallService extends Service {
     @Override public IBinder onBind(Intent intent) {
         return mBinder;
     }
+
+    /** {@inheritDoc} */
+    @Override public void onCreate() {
+        InCallPresenter inCallPresenter = InCallPresenter.getInstance();
+        inCallPresenter.setUp(
+                getApplicationContext(), CallList.getInstance(), AudioModeProvider.getInstance());
+    }
+
+    /** {@inheritDoc} */
+    @Override public void onDestroy() {
+        // Tear down the InCall system
+        CallList.getInstance().clearOnDisconnect();
+        InCallPresenter.getInstance().tearDown();
+    }
 }