Merge "Fix an upgrade bug in SettingsProvider." into froyo

2010-04-13 10:05:27 -07:00
parent c30890e102 cd66caf015
commit 842d983cc3
1 changed files with 2 additions and 1 deletions
--- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
@@ -789,7 +789,8 @@ public class DatabaseHelper extends SQLiteOpenHelper {
                        + " VALUES(?,?);");
    
                // Set the timeout to 30 minutes in milliseconds
-                loadIntegerSetting(stmt, Settings.System.SCREEN_OFF_TIMEOUT, 30 * 60 * 1000);
+                loadSetting(stmt, Settings.System.SCREEN_OFF_TIMEOUT,
+                        Integer.toString(30 * 60 * 1000));
            } finally {
                if (stmt != null) stmt.close();
            }