diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 7532763..5c1164b 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -18,7 +18,7 @@
     package="com.android.dialer"
     coreApp="true">
 
-    <uses-permission android:name="android.permission.CALL_PRIVILEGED" />
+    <uses-permission android:name="android.permission.CALL_PHONE" />
     <uses-permission android:name="android.permission.READ_CONTACTS" />
     <uses-permission android:name="android.permission.WRITE_CONTACTS" />
     <uses-permission android:name="android.permission.READ_CALL_LOG" />
diff --git a/src/com/android/dialer/util/DialerUtils.java b/src/com/android/dialer/util/DialerUtils.java
index bd18133..93a055d 100644
--- a/src/com/android/dialer/util/DialerUtils.java
+++ b/src/com/android/dialer/util/DialerUtils.java
@@ -15,6 +15,7 @@
  */
 package com.android.dialer.util;
 
+import android.app.Activity;
 import android.content.ActivityNotFoundException;
 import android.content.ComponentName;
 import android.content.Context;
@@ -64,7 +65,11 @@
      */
     public static void startActivityWithErrorToast(Context context, Intent intent, int msgId) {
         try {
-          context.startActivity(intent);
+            if (Intent.ACTION_CALL.equals(intent.getAction())) {
+                ((Activity) context).startActivityForResult(intent, 0);
+            } else {
+                context.startActivity(intent);
+            }
         } catch (ActivityNotFoundException e) {
             Toast.makeText(context, msgId, Toast.LENGTH_SHORT).show();
         }
