From 31f90b62e8c83270094f5b0b4c75a0e06d72cd75 Mon Sep 17 00:00:00 2001 From: Jim Miller Date: Wed, 20 Jan 2010 13:35:20 -0800 Subject: Fix 2385283: Add DevicePolicyManager calls to LockScreen. --- .../src/com/android/providers/settings/DatabaseHelper.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'packages/SettingsProvider') 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 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()); -- cgit v1.1