Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 61f280d5 authored by Amith Yamasani's avatar Amith Yamasani Committed by Android Git Automerger
Browse files

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

Merge commit 'feb976e6' into kraken

* commit 'feb976e6':
  Fix an upgrade bug in SettingsProvider.
parents b8430335 feb976e6

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

+2 −1
Original line number Diff line number Diff line
@@ -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();

            }