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

Commit 99e164d0 authored by Ricardo Cerqueira's avatar Ricardo Cerqueira
Browse files

Revert "Dialer AutoComplete: Bootstrap the onUpgrade for the SettingsProvider" 

This reverts commit 13de0c4ea78613b9020e8733c241aa31d33c4907.
parent abbe71fa

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

+1 −20
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ public class DatabaseHelper extends SQLiteOpenHelper { 
    // database gets upgraded properly. At a minimum, please confirm that 'upgradeVersion'

    // is properly propagated through your change.  Not doing so will result in a loss of user

    // settings.

    private static final int DATABASE_VERSION = 99;

    private static final int DATABASE_VERSION = 98;



    private Context mContext;

    private int mUserHandle;
@@ -1559,25 +1559,6 @@ public class DatabaseHelper extends SQLiteOpenHelper { 
            upgradeVersion = 98;

        }



        if (upgradeVersion == 98) {

            // Add Default Dialer AutoComplete setting

            if (mUserHandle == UserHandle.USER_OWNER) {

                db.beginTransaction();

                SQLiteStatement stmt = null;

                try {

                    stmt = db.compileStatement("INSERT OR IGNORE INTO secure(name,value)"

                            + " VALUES(?,?);");

                    loadIntegerSetting(stmt, Settings.Secure.DIALPAD_AUTOCOMPLETE,

                            R.integer.def_dialpad_autocomplete);

                    db.setTransactionSuccessful();

                } finally {

                    db.endTransaction();

                    if (stmt != null) stmt.close();

                }

            }

            upgradeVersion = 99;

        }



        // *** Remember to update DATABASE_VERSION above!



        if (upgradeVersion != currentVersion) {