diff options
| author | Amith Yamasani <yamasani@google.com> | 2010-04-13 11:54:04 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-13 11:54:04 -0700 |
| commit | 61f280d520fa83522d9d7a54e19add1cfee91917 (patch) | |
| tree | 10bee194b2b6f1613e65859b0c8f200018f99fa0 /packages/SettingsProvider | |
| parent | b8430335665517181a28d2fbdf706d295be4abf2 (diff) | |
| parent | feb976e6be3a07dd31b35b35287420bba9ffbbf3 (diff) | |
| download | frameworks_base-61f280d520fa83522d9d7a54e19add1cfee91917.zip frameworks_base-61f280d520fa83522d9d7a54e19add1cfee91917.tar.gz frameworks_base-61f280d520fa83522d9d7a54e19add1cfee91917.tar.bz2 | |
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.
Diffstat (limited to 'packages/SettingsProvider')
| -rw-r--r-- | packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java | 3 |
1 files changed, 2 insertions, 1 deletions
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 @@ 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(); } |