Merge "Handle the case where the restore environment doesn't have the ringtone" into klp-dev

2013-09-11 18:27:53 +00:00
parent c1cf491d16 2e804444d6
commit b926d484a7
1 changed files with 4 additions and 0 deletions
--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsHelper.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsHelper.java
@@ -104,6 +104,10 @@ public class SettingsHelper {
        } else {
            Uri canonicalUri = Uri.parse(value);
            ringtoneUri = mContext.getContentResolver().uncanonicalize(canonicalUri);
+            if (ringtoneUri == null) {
+                // Unrecognized or invalid Uri, don't restore
+                return;
+            }
        }
        final int ringtoneType = Settings.System.RINGTONE.equals(name)
                ? RingtoneManager.TYPE_RINGTONE : RingtoneManager.TYPE_NOTIFICATION;