diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 63cb07c2ce5..6ff363904f8 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1109,7 +1109,11 @@
         <!-- Lock screen settings -->
         <activity android:name="ConfirmDeviceCredentialActivity"
             android:exported="true">
-            <!-- Use high-priority to prevent an installed activity from masquerading as this one. -->
+            <intent-filter>
+                <action android:name="android.app.action.CONFIRM_DEVICE_CREDENTIAL" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <!-- TODO: Remove this once new API is being used -->
             <intent-filter android:priority="1000">
                 <action android:name="android.intent.action.CONFIRM_DEVICE_CREDENTIAL" />
                 <category android:name="android.intent.category.DEFAULT" />
diff --git a/src/com/android/settings/ConfirmDeviceCredentialActivity.java b/src/com/android/settings/ConfirmDeviceCredentialActivity.java
index 6a5c486f847..6b2bfd282aa 100644
--- a/src/com/android/settings/ConfirmDeviceCredentialActivity.java
+++ b/src/com/android/settings/ConfirmDeviceCredentialActivity.java
@@ -18,6 +18,7 @@
 package com.android.settings;
 
 import android.app.Activity;
+import android.app.KeyguardManager;
 import android.content.Intent;
 import android.os.Bundle;
 import android.util.Log;
@@ -34,8 +35,8 @@ public class ConfirmDeviceCredentialActivity extends Activity {
         super.onCreate(savedInstanceState);
 
         Intent intent = getIntent();
-        String title = intent.getStringExtra(Intent.EXTRA_TITLE);
-        String details = intent.getStringExtra(Intent.EXTRA_DETAILS);
+        String title = intent.getStringExtra(KeyguardManager.EXTRA_TITLE);
+        String details = intent.getStringExtra(KeyguardManager.EXTRA_DESCRIPTION);
 
         ChooseLockSettingsHelper helper = new ChooseLockSettingsHelper(this);
         if (!helper.launchConfirmationActivity(0 /* request code */, title, details)) {