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

Commit 284585aa authored by Amith Yamasani's avatar Amith Yamasani Committed by Android (Google) Code Review
Browse files

Merge "Don't change system sound defaults for upgrades."

parents e29ea093 e6087d77
Loading
Loading
Loading
Loading
+0 −8
Original line number Original line Diff line number Diff line
@@ -907,20 +907,12 @@ public class DatabaseHelper extends SQLiteOpenHelper {
        if (upgradeVersion == 68) {
        if (upgradeVersion == 68) {
            // Enable all system sounds by default
            // Enable all system sounds by default
            db.beginTransaction();
            db.beginTransaction();
            SQLiteStatement stmt = null;
            try {
            try {
                stmt = db.compileStatement("INSERT OR REPLACE INTO system(name,value)"
                        + " VALUES(?,?);");
                loadDefaultHapticSettings(stmt);
                loadUISoundEffectsSettings(stmt);
                db.execSQL("DELETE FROM system WHERE name='"
                db.execSQL("DELETE FROM system WHERE name='"
                        + Settings.System.NOTIFICATIONS_USE_RING_VOLUME + "'");
                        + Settings.System.NOTIFICATIONS_USE_RING_VOLUME + "'");
                stmt.close();
                db.setTransactionSuccessful();
                db.setTransactionSuccessful();
            } finally {
            } finally {
                db.endTransaction();
                db.endTransaction();
                if (stmt != null)
                    stmt.close();
            }
            }
            upgradeVersion = 69;
            upgradeVersion = 69;
        }
        }