From c48b3d9b715ecdc66c2695836c1a04f15bb30755 Mon Sep 17 00:00:00 2001
From: Dianne Hackborn <hackbod@google.com>
Date: Fri, 26 Feb 2010 17:26:15 -0800
Subject: [PATCH] Move DeviceAdmin APIs to android.app.admin.

---
 .../com/example/android/apis/app/DeviceAdminSample.java    | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/samples/ApiDemos/src/com/example/android/apis/app/DeviceAdminSample.java b/samples/ApiDemos/src/com/example/android/apis/app/DeviceAdminSample.java
index 776a6fb27..07ce0c67c 100644
--- a/samples/ApiDemos/src/com/example/android/apis/app/DeviceAdminSample.java
+++ b/samples/ApiDemos/src/com/example/android/apis/app/DeviceAdminSample.java
@@ -21,8 +21,8 @@ import com.example.android.apis.R;
 import android.app.Activity;
 import android.app.ActivityManager;
 import android.app.AlertDialog;
-import android.app.DeviceAdminReceiver;
-import android.app.DevicePolicyManager;
+import android.app.admin.DeviceAdminReceiver;
+import android.app.admin.DevicePolicyManager;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -339,7 +339,8 @@ public class DeviceAdminSample extends DeviceAdminReceiver {
                 }
                 boolean active = mDPM.isAdminActive(mDeviceAdminSample);
                 if (active) {
-                    mDPM.resetPassword(mPassword.getText().toString());
+                    mDPM.resetPassword(mPassword.getText().toString(),
+                            DevicePolicyManager.RESET_PASSWORD_REQUIRE_ENTRY);
                 }
             }
         };