diff --git a/java/com/android/dialer/calldetails/CallDetailsActivity.java b/java/com/android/dialer/calldetails/CallDetailsActivity.java
index b15dc45..bf978ec 100644
--- a/java/com/android/dialer/calldetails/CallDetailsActivity.java
+++ b/java/com/android/dialer/calldetails/CallDetailsActivity.java
@@ -32,6 +32,7 @@
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.annotation.RequiresPermission;
+import android.support.v4.os.BuildCompat;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
@@ -52,6 +53,7 @@
 import com.android.dialer.common.concurrent.DialerExecutor.SuccessListener;
 import com.android.dialer.common.concurrent.DialerExecutor.Worker;
 import com.android.dialer.common.concurrent.DialerExecutorComponent;
+import com.android.dialer.compat.telephony.TelephonyManagerCompat;
 import com.android.dialer.constants.ActivityRequestCodes;
 import com.android.dialer.dialercontact.DialerContact;
 import com.android.dialer.duo.Duo;
@@ -407,8 +409,14 @@
 
     @Override
     public void openAssistedDialingSettings(View unused) {
-      Intent intent = new Intent(getActivity(), AssistedDialingSettingActivity.class);
-      getActivity().startActivity(intent);
+      if (BuildCompat.isAtLeastP()) {
+        Intent callSettingsIntent =
+            new Intent(TelephonyManagerCompat.ACTION_SHOW_ASSISTED_DIALING_SETTINGS);
+        getActivity().startActivity(callSettingsIntent);
+      } else {
+        Intent intent = new Intent(getActivity(), AssistedDialingSettingActivity.class);
+        getActivity().startActivity(intent);
+      }
     }
 
     @Override
diff --git a/java/com/android/dialer/compat/telephony/TelephonyManagerCompat.java b/java/com/android/dialer/compat/telephony/TelephonyManagerCompat.java
index 86f344f..669cba7 100644
--- a/java/com/android/dialer/compat/telephony/TelephonyManagerCompat.java
+++ b/java/com/android/dialer/compat/telephony/TelephonyManagerCompat.java
@@ -80,6 +80,10 @@
    */
   public static final Integer FEATURES_ASSISTED_DIALING = 1 << 4;
 
+  /** The {@link android.content.Intent} action used to show the assisted dialing settings. */
+  public static final String ACTION_SHOW_ASSISTED_DIALING_SETTINGS =
+      "android.telecom.action.SHOW_ASSISTED_DIALING_SETTINGS";
+
   /**
    * Returns the number of phones available. Returns 1 for Single standby mode (Single SIM
    * functionality) Returns 2 for Dual standby mode.(Dual SIM functionality)
