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

Commit 912f0186 authored by Amith Yamasani's avatar Amith Yamasani Committed by Android Git Automerger
Browse files

am 68c30860: am 73f24ae1: am 9a147340: Merge "Don\'t update global table when... 

am 68c30860: am 73f24ae1: am 9a147340: Merge "Don\'t update global table when upgrading secondary users\' database." into jb-mr1.1-dev

* commit '68c30860':
  Don't update global table when upgrading secondary users' database.
parents ca059d6d 68c30860

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

+13 −11
Original line number Diff line number Diff line
@@ -1507,6 +1507,7 @@ public class DatabaseHelper extends SQLiteOpenHelper { 


        if (upgradeVersion == 94) {

            // Add wireless charging started sound setting

            if (mUserHandle == UserHandle.USER_OWNER) {

                db.beginTransaction();

                SQLiteStatement stmt = null;

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

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

                }

            }

            upgradeVersion = 95;

        }