From 5802c11140d42ceb71254f34c442452253fdd0aa Mon Sep 17 00:00:00 2001 From: Chippa-a Date: Thu, 3 Oct 2019 18:40:45 +0300 Subject: [PATCH] lineage-sdk: Update path for custom charging sound Audio files were moved to /product on Android 10. Moreover, align with AOSP and use the wireless sound for wired usecase too. In order to perform upgrade properly, handle the migration for custom charging sound setting. Change-Id: Ifb2085e3f56d777091d66544a72cdd75c843fb56 --- .../res/values/defaults.xml | 2 +- .../LineageDatabaseHelper.java | 22 ++++++++++++++++++- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/packages/LineageSettingsProvider/res/values/defaults.xml b/packages/LineageSettingsProvider/res/values/defaults.xml index a877c147..c6f1e3df 100644 --- a/packages/LineageSettingsProvider/res/values/defaults.xml +++ b/packages/LineageSettingsProvider/res/values/defaults.xml @@ -74,7 +74,7 @@ false - /system/media/audio/ui/ChargingStarted.ogg + /system/product/media/audio/ui/WirelessChargingStarted.ogg 255 diff --git a/packages/LineageSettingsProvider/src/org/lineageos/lineagesettings/LineageDatabaseHelper.java b/packages/LineageSettingsProvider/src/org/lineageos/lineagesettings/LineageDatabaseHelper.java index 267370e9..561ff497 100644 --- a/packages/LineageSettingsProvider/src/org/lineageos/lineagesettings/LineageDatabaseHelper.java +++ b/packages/LineageSettingsProvider/src/org/lineageos/lineagesettings/LineageDatabaseHelper.java @@ -48,7 +48,7 @@ public class LineageDatabaseHelper extends SQLiteOpenHelper{ private static final boolean LOCAL_LOGV = false; private static final String DATABASE_NAME = "lineagesettings.db"; - private static final int DATABASE_VERSION = 12; + private static final int DATABASE_VERSION = 13; private static final String DATABASE_NAME_OLD = "cmsettings.db"; @@ -426,6 +426,26 @@ public class LineageDatabaseHelper extends SQLiteOpenHelper{ } upgradeVersion = 12; } + + if (upgradeVersion < 13) { + // Update custom charging sound setting + if (mUserHandle == UserHandle.USER_OWNER) { + db.beginTransaction(); + SQLiteStatement stmt = null; + try { + stmt = db.compileStatement("UPDATE global SET value=? WHERE name=?"); + stmt.bindString(1, mContext.getResources() + .getString(R.string.def_power_notifications_ringtone)); + stmt.bindString(2, LineageSettings.Global.POWER_NOTIFICATIONS_RINGTONE); + stmt.execute(); + db.setTransactionSuccessful(); + } finally { + if (stmt != null) stmt.close(); + db.endTransaction(); + } + } + upgradeVersion = 13; + } // *** Remember to update DATABASE_VERSION above! }