aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChippa-a <vusal1372@gmail.com>2019-10-03 18:40:45 +0300
committerBruno Martins <bgcngm@gmail.com>2020-04-21 15:05:56 +0100
commit5802c11140d42ceb71254f34c442452253fdd0aa (patch)
treedc438efd391a918e59b45ae686f1adc06295f257
parentb485a25aa32ce5d96f7e5fddf09fe236483883a0 (diff)
downloadlineage-sdk-5802c11140d42ceb71254f34c442452253fdd0aa.tar.gz
lineage-sdk-5802c11140d42ceb71254f34c442452253fdd0aa.tar.bz2
lineage-sdk-5802c11140d42ceb71254f34c442452253fdd0aa.zip
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
-rw-r--r--packages/LineageSettingsProvider/res/values/defaults.xml2
-rw-r--r--packages/LineageSettingsProvider/src/org/lineageos/lineagesettings/LineageDatabaseHelper.java22
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 @@
<bool name="def_power_notifications_vibrate">false</bool>
<!-- Default for LineageSettings.Global.POWER_NOTIFICATIONS_RINGTONE -->
- <string name="def_power_notifications_ringtone" translatable="false">/system/media/audio/ui/ChargingStarted.ogg</string>
+ <string name="def_power_notifications_ringtone" translatable="false">/system/product/media/audio/ui/WirelessChargingStarted.ogg</string>
<!-- Default value for the battery LEDs brightness -->
<integer name="def_battery_brightness_level">255</integer>
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!
}