am feb976e6: am 842d983c: Merge "Fix an upgrade bug in SettingsProvider." into froyo

Merge commit 'feb976e6be3a07dd31b35b35287420bba9ffbbf3' into kraken

* commit 'feb976e6be3a07dd31b35b35287420bba9ffbbf3':
  Fix an upgrade bug in SettingsProvider.

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();
             }