Settings: check current ringtone for non-default sub ids

Otherwise the default phone sub's selection would always be pre-selected
regardless of the actual selection.

Ticket: CYNGNOS-2396

Change-Id: Ia33df47228eb2a49d48c80535876756b4ba1abf1
Signed-off-by: Roman Birg <roman@cyngn.com>

1 files changed, 6 insertions, 2 deletions

diff --git a/src/com/android/settings/DefaultRingtonePreference.java b/src/com/android/settings/DefaultRingtonePreference.java
index d3cbe5a..4bf2cfa 100644
--- a/src/com/android/settings/DefaultRingtonePreference.java
+++ b/src/com/android/settings/DefaultRingtonePreference.java
@@ -55,7 +55,11 @@ public class DefaultRingtonePreference extends RingtonePreference {
 
     @Override
     protected Uri onRestoreRingtone() {
-        return RingtoneManager.getActualDefaultRingtoneUri(getContext(), getRingtoneType());
+        if (getRingtoneType() == RingtoneManager.TYPE_RINGTONE) {
+            return RingtoneManager.getActualRingtoneUriBySubId(getContext(), getSubId());
+        } else {
+            return RingtoneManager.getActualDefaultRingtoneUri(getContext(), getRingtoneType());
+        }
     }
-    
+
 }