Move default sound resource entry from product to system partition
Android 10 moved the sound resources from system to product
partition. This breaks user settings for the default sound
settings during an OTA upgrade for next Major version.
Address this issue by moving the settings entry back to system
partition.
Issue: FP3-A11#154
Issue: FP3-A11#233
Change-Id: Ic34cab062c01f0e31f005dd58d60a82a295996ad
Depends-On: Ie949e8166ffaf6aa4c1ce2a14a7a359d77bca3b6
(cherry picked from commit b2aadba4aeb20b8b69cad8ee38a8eb5b9d128f81)
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index 7111baa..7ac4be0 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -3698,7 +3698,7 @@
<item name="config_inCallNotificationVolume" format="float" type="dimen">.10</item>
<!-- URI for in call notification sound -->
- <string translatable="false" name="config_inCallNotificationSound">/product/media/audio/ui/InCallNotification.ogg</string>
+ <string translatable="false" name="config_inCallNotificationSound">/system/media/audio/ui/InCallNotification.ogg</string>
<!-- Default number of notifications from the same app before they are automatically grouped by the OS -->
<integer translatable="false" name="config_autoGroupAtCount">4</integer>
diff --git a/packages/SettingsProvider/res/values/defaults.xml b/packages/SettingsProvider/res/values/defaults.xml
index 5f47cfe..2ec4c1a 100644
--- a/packages/SettingsProvider/res/values/defaults.xml
+++ b/packages/SettingsProvider/res/values/defaults.xml
@@ -64,19 +64,19 @@
<!-- user interface sound effects -->
<integer name="def_power_sounds_enabled">1</integer>
- <string name="def_low_battery_sound" translatable="false">/product/media/audio/ui/LowBattery.ogg</string>
+ <string name="def_low_battery_sound" translatable="false">/system/media/audio/ui/LowBattery.ogg</string>
<integer name="def_dock_sounds_enabled">0</integer>
<integer name="def_dock_sounds_enabled_when_accessibility">0</integer>
- <string name="def_desk_dock_sound" translatable="false">/product/media/audio/ui/Dock.ogg</string>
- <string name="def_desk_undock_sound" translatable="false">/product/media/audio/ui/Undock.ogg</string>
- <string name="def_car_dock_sound" translatable="false">/product/media/audio/ui/Dock.ogg</string>
- <string name="def_car_undock_sound" translatable="false">/product/media/audio/ui/Undock.ogg</string>
+ <string name="def_desk_dock_sound" translatable="false">/system/media/audio/ui/Dock.ogg</string>
+ <string name="def_desk_undock_sound" translatable="false">/system/media/audio/ui/Undock.ogg</string>
+ <string name="def_car_dock_sound" translatable="false">/system/media/audio/ui/Dock.ogg</string>
+ <string name="def_car_undock_sound" translatable="false">/system/media/audio/ui/Undock.ogg</string>
<integer name="def_lockscreen_sounds_enabled">1</integer>
- <string name="def_lock_sound" translatable="false">/product/media/audio/ui/Lock.ogg</string>
- <string name="def_unlock_sound" translatable="false">/product/media/audio/ui/Unlock.ogg</string>
- <string name="def_trusted_sound" translatable="false">/product/media/audio/ui/Trusted.ogg</string>
- <string name="def_wireless_charging_started_sound" translatable="false">/product/media/audio/ui/WirelessChargingStarted.ogg</string>
- <string name="def_charging_started_sound" translatable="false">/product/media/audio/ui/ChargingStarted.ogg</string>
+ <string name="def_lock_sound" translatable="false">/system/media/audio/ui/Lock.ogg</string>
+ <string name="def_unlock_sound" translatable="false">/system/media/audio/ui/Unlock.ogg</string>
+ <string name="def_trusted_sound" translatable="false">/system/media/audio/ui/Trusted.ogg</string>
+ <string name="def_wireless_charging_started_sound" translatable="false">/system/media/audio/ui/WirelessChargingStarted.ogg</string>
+ <string name="def_charging_started_sound" translatable="false">/system/media/audio/ui/ChargingStarted.ogg</string>
<!-- sound trigger detection service default values -->
<integer name="def_max_sound_trigger_detection_service_ops_per_day" translatable="false">1000</integer>