diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 55736f4a704..bc581b8e7d8 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1002,6 +1002,16 @@
         <!-- Second and third-level settings -->
 
         <!-- 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 android:priority="1000">
+                <action android:name="android.intent.action.CONFIRM_DEVICE_CREDENTIAL" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
+
         <activity android:name="ConfirmLockPattern"/>
 
         <activity android:name="ConfirmLockPassword"
diff --git a/src/com/android/settings/ConfirmDeviceCredentialActivity.java b/src/com/android/settings/ConfirmDeviceCredentialActivity.java
new file mode 100644
index 00000000000..6a5c486f847
--- /dev/null
+++ b/src/com/android/settings/ConfirmDeviceCredentialActivity.java
@@ -0,0 +1,55 @@
+
+/*
+ * Copyright (C) 2014 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.settings;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.util.Log;
+
+/**
+ * Launch this when you want to confirm the user is present by asking them to enter their
+ * PIN/password/pattern.
+ */
+public class ConfirmDeviceCredentialActivity extends Activity {
+    public static final String TAG = ConfirmDeviceCredentialActivity.class.getSimpleName();
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        Intent intent = getIntent();
+        String title = intent.getStringExtra(Intent.EXTRA_TITLE);
+        String details = intent.getStringExtra(Intent.EXTRA_DETAILS);
+
+        ChooseLockSettingsHelper helper = new ChooseLockSettingsHelper(this);
+        if (!helper.launchConfirmationActivity(0 /* request code */, title, details)) {
+            Log.d(TAG, "No pattern, password or PIN set.");
+            setResult(Activity.RESULT_OK);
+            finish();
+        }
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        boolean credentialsConfirmed = (resultCode == Activity.RESULT_OK);
+        Log.d(TAG, "Device credentials confirmed: " + credentialsConfirmed);
+        setResult(credentialsConfirmed ? Activity.RESULT_OK : Activity.RESULT_CANCELED);
+        finish();
+    }
+}