am dd9157ce: am b926d484: Merge "Handle the case where the restore environment doesn\'t have the ringtone" into klp-dev

* commit 'dd9157ce314f3b8d20f6b65a6f9dbf00acbe7ea1':
  Handle the case where the restore environment doesn't have the ringtone

1 files changed, 4 insertions, 0 deletions

diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsHelper.java
index 080290c..dd7a828 100644
--- 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;