diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java
index e66dd34..f2119e0 100644
--- a/src/com/android/dialer/DialtactsActivity.java
+++ b/src/com/android/dialer/DialtactsActivity.java
@@ -57,7 +57,7 @@
 import android.widget.SearchView.OnQueryTextListener;
 
 import com.android.contacts.common.CallUtil;
-import com.android.contacts.activities.TransactionSafeActivity;
+import com.android.contacts.common.activity.TransactionSafeActivity;
 import com.android.contacts.interactions.PhoneNumberInteraction;
 import com.android.contacts.list.ContactListFilterController;
 import com.android.contacts.list.ContactListFilterController.ContactListFilterListener;
@@ -78,8 +78,7 @@
  * embedded using intents.
  * The dialer tab's title is 'phone', a more common name (see strings.xml).
  */
-public class DialtactsActivity extends TransactionSafeActivity
-        implements View.OnClickListener {
+public class DialtactsActivity extends TransactionSafeActivity implements View.OnClickListener {
     private static final String TAG = "DialtactsActivity";
 
     public static final boolean DEBUG = false;
diff --git a/src/com/android/dialer/contact/ContactUpdateService.java b/src/com/android/dialer/contact/ContactUpdateService.java
new file mode 100644
index 0000000..9edd198
--- /dev/null
+++ b/src/com/android/dialer/contact/ContactUpdateService.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.contact;
+
+import android.app.IntentService;
+import android.content.Context;
+import android.content.Intent;
+
+import com.android.contacts.common.database.ContactUpdateUtils;
+
+/**
+ * Service for updating primary number on a contact.
+ */
+public class ContactUpdateService extends IntentService {
+
+    public static final String EXTRA_PHONE_NUMBER_DATA_ID = "phone_number_data_id";
+
+    public ContactUpdateService() {
+        super(ContactUpdateService.class.getSimpleName());
+        setIntentRedelivery(true);
+    }
+
+    /** Creates an intent that sets the selected data item as super primary (default) */
+    public static Intent createSetSuperPrimaryIntent(Context context, long dataId) {
+        Intent serviceIntent = new Intent(context, ContactUpdateService.class);
+        serviceIntent.putExtra(EXTRA_PHONE_NUMBER_DATA_ID, dataId);
+        return serviceIntent;
+    }
+
+    @Override
+    protected void onHandleIntent(Intent intent) {
+        // Currently this service only handles one type of update.
+        long dataId = intent.getLongExtra(EXTRA_PHONE_NUMBER_DATA_ID, -1);
+
+        ContactUpdateUtils.setSuperPrimary(this, dataId);
+    }
+}
