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

Commit e6087d77 authored by Amith Yamasani's avatar Amith Yamasani
Browse files

Don't change system sound defaults for upgrades. 

This reverts an earlier change that reset the system sound defaults even
for upgrades.

Bug: 5114198
Change-Id: Ide0afbd26080ba87d177cedfa9b1d50352857a00
parent 01704e76

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

+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;

        }

        }