diff --git a/src/com/android/telecomm/TelecommServiceImpl.java b/src/com/android/telecomm/TelecommServiceImpl.java
index 1b377b8..e3f8bcb 100644
--- a/src/com/android/telecomm/TelecommServiceImpl.java
+++ b/src/com/android/telecomm/TelecommServiceImpl.java
@@ -16,9 +16,13 @@
 
 package com.android.telecomm;
 
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.res.Resources;
 import android.os.Handler;
 import android.os.Message;
 import android.os.ServiceManager;
+import android.text.TextUtils;
 
 import com.android.internal.telecomm.ITelecommService;
 
@@ -119,4 +123,17 @@
     private void showCallScreenInternal(boolean showDialpad) {
         CallsManager.getInstance().getInCallController().bringToForeground(showDialpad);
     }
+
+    @Override
+    public ComponentName getSystemPhoneApplication() {
+        final Resources resources = TelecommApp.getInstance().getResources();
+        final String packageName = resources.getString(R.string.ui_default_package);
+        final String className = resources.getString(R.string.dialer_default_class);
+
+        if (TextUtils.isEmpty(packageName) || TextUtils.isEmpty(className)) {
+            return null;
+        }
+
+        return new ComponentName(packageName, className);
+    }
 }
