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

Commit d1a81b71 authored by Christopher Tate's avatar Christopher Tate Committed by Android Git Automerger
Browse files

am 2203e532: am 04e6827a: Fix settings db update sequence automerge: 281763ba 

* commit '2203e532':
  Fix settings db update sequence
parents e85eebd2 2203e532

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

+12 −10
Original line number Diff line number Diff line
@@ -1829,6 +1829,7 @@ public class DatabaseHelper extends SQLiteOpenHelper { 
        }



        if (upgradeVersion < 114) {

            if (mUserHandle == UserHandle.USER_OWNER) {

                db.beginTransaction();

                SQLiteStatement stmt = null;

                try {
@@ -1840,6 +1841,7 @@ public class DatabaseHelper extends SQLiteOpenHelper { 
                    db.endTransaction();

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

                }

            }

            upgradeVersion = 114;

        }

        // *** Remember to update DATABASE_VERSION above!