summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/MasterClear.java
diff options
context:
space:
mode:
authorJim Miller <jaggies@google.com>2010-01-20 13:37:14 -0800
committerJim Miller <jaggies@google.com>2010-01-20 13:37:14 -0800
commit47d380f1e6c823cea444004cb799d4c791145cc6 (patch)
tree76898bb7525259c96b8828ef0d62523c992a0381 /src/com/android/settings/MasterClear.java
parentfeff65213231ba6a0f6185f98e660042b5b14595 (diff)
downloadpackages_apps_Settings-47d380f1e6c823cea444004cb799d4c791145cc6.tar.gz
packages_apps_Settings-47d380f1e6c823cea444004cb799d4c791145cc6.tar.bz2
packages_apps_Settings-47d380f1e6c823cea444004cb799d4c791145cc6.zip
Fix 2385283: Add DevicePolicyManager calls to LockScreen.
Diffstat (limited to 'src/com/android/settings/MasterClear.java')
-rw-r--r--src/com/android/settings/MasterClear.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/com/android/settings/MasterClear.java b/src/com/android/settings/MasterClear.java
index fd4a41179..d33e1e867 100644
--- a/src/com/android/settings/MasterClear.java
+++ b/src/com/android/settings/MasterClear.java
@@ -53,7 +53,7 @@ public class MasterClear extends Activity {
private View mFinalView;
private Button mFinalButton;
- /**
+ /**
* The user has gone through the multiple confirmation, so now we go ahead
* and invoke the Checkin Service to reset the device to its factory-default
* state (rebooting in the process).
@@ -65,7 +65,7 @@ public class MasterClear extends Activity {
return;
}
- ICheckinService service =
+ ICheckinService service =
ICheckinService.Stub.asInterface(ServiceManager.getService("checkin"));
if (service != null) {
try {
@@ -159,7 +159,7 @@ public class MasterClear extends Activity {
* click in order to initiate a confirmation sequence. This method is
* called from various other points in the code to reset the activity to
* this base state.
- *
+ *
* <p>Reinflating views from resources is expensive and prevents us from
* caching widget pointers, so we use a single-inflate pattern: we lazy-
* inflate each view, caching all of the widget pointers we'll need at the
@@ -184,7 +184,7 @@ public class MasterClear extends Activity {
mInitialView = null;
mFinalView = null;
mInflater = LayoutInflater.from(this);
- mLockUtils = new LockPatternUtils(getContentResolver());
+ mLockUtils = new LockPatternUtils(this);
establishInitialState();
}