summaryrefslogtreecommitdiffstats
path: root/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
diff options
context:
space:
mode:
authorJim Miller <jaggies@google.com>2010-01-20 13:35:20 -0800
committerJim Miller <jaggies@google.com>2010-01-20 14:48:37 -0800
commit31f90b62e8c83270094f5b0b4c75a0e06d72cd75 (patch)
tree5f3cd8d9dfe70cbb5ed607cb4dabf7e46a29c648 /packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
parentb49d9af7e1205312cc25e23636ef3980bee4c1b0 (diff)
downloadframeworks_base-31f90b62e8c83270094f5b0b4c75a0e06d72cd75.zip
frameworks_base-31f90b62e8c83270094f5b0b4c75a0e06d72cd75.tar.gz
frameworks_base-31f90b62e8c83270094f5b0b4c75a0e06d72cd75.tar.bz2
Fix 2385283: Add DevicePolicyManager calls to LockScreen.
Diffstat (limited to 'packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java')
-rw-r--r--packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
index a1dca7e..89d75b7 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
@@ -580,7 +580,7 @@ public class DatabaseHelper extends SQLiteOpenHelper {
upgradeVersion = 46;
}
-
+
if (upgradeVersion != currentVersion) {
Log.w(TAG, "Got stuck trying to upgrade from version " + upgradeVersion
+ ", must wipe the settings provider");
@@ -608,7 +608,7 @@ public class DatabaseHelper extends SQLiteOpenHelper {
if (!TextUtils.isEmpty(lockPattern)) {
// Convert lock pattern
try {
- LockPatternUtils lpu = new LockPatternUtils(mContext.getContentResolver());
+ LockPatternUtils lpu = new LockPatternUtils(mContext);
List<LockPatternView.Cell> cellPattern =
LockPatternUtils.stringToPattern(lockPattern);
lpu.saveLockPattern(cellPattern);
@@ -928,11 +928,11 @@ public class DatabaseHelper extends SQLiteOpenHelper {
private void loadSecure35Settings(SQLiteStatement stmt) {
loadBooleanSetting(stmt, Settings.Secure.BACKUP_ENABLED,
R.bool.def_backup_enabled);
-
+
loadStringSetting(stmt, Settings.Secure.BACKUP_TRANSPORT,
R.string.def_backup_transport);
}
-
+
private void loadSetting(SQLiteStatement stmt, String key, Object value) {
stmt.bindString(1, key);
stmt.bindString(2, value.toString());