Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Merge commit '842d983cc3158a3de77a897d071b5b9c18dd2b55' into froyo-plus-aosp

* commit '842d983cc3158a3de77a897d071b5b9c18dd2b55':
  Fix an upgrade bug in SettingsProvider.
This commit is contained in:
Amith Yamasani
2010-04-13 10:08:10 -07:00
committed by Android Git Automerger
parent 34b2ecc82a 842d983cc3
commit feb976e6be
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
View File

@@ -789,7 +789,8 @@ public class DatabaseHelper extends SQLiteOpenHelper {
+ " VALUES(?,?);"); + " VALUES(?,?);");
// Set the timeout to 30 minutes in milliseconds // 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 { } finally {
if (stmt != null) stmt.close(); if (stmt != null) stmt.close();
} }