commit 842d983cc3158a3de77a897d071b5b9c18dd2b55
author Amith Yamasani <yamasani@google.com> Tue Apr 13 10:05:27 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 13 10:05:27 2010 -0700
tree 5eebf78207e77d7b001f40d5ff2bf5829a629df4
parent c30890e102cbae24e4c821ba4274f6ac8b18f1db
parent cd66caf015d18baa03a86796649550cb65cd99ea

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

packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java

diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
index 0c0bf93..2b4714d 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
@@ -789,7 +789,8 @@
                         + " 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();
             }