Merge "Adds speakerphone extra to ACTION_DIAL (1/2)."
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);
+    }
 }
diff --git a/tests/src/com/android/telecomm/testapps/TestDialerActivity.java b/tests/src/com/android/telecomm/testapps/TestDialerActivity.java
index 405bca5..5f3c999 100644
--- a/tests/src/com/android/telecomm/testapps/TestDialerActivity.java
+++ b/tests/src/com/android/telecomm/testapps/TestDialerActivity.java
@@ -3,6 +3,7 @@
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
+import android.telecomm.TelecommConstants;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.EditText;
@@ -47,7 +48,9 @@
     }
 
     private void setDefault() {
-        // TODO: Send a request to become the default dialer application
+        final Intent intent = new Intent(TelecommConstants.ACTION_CHANGE_DEFAULT_PHONE);
+        intent.putExtra(TelecommConstants.EXTRA_PACKAGE_NAME, this.getBasePackageName());
+        startActivity(intent);
     }
 
     private void placeCall() {