diff options
| -rw-r--r-- | media/java/android/media/RingtoneManager.java | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/media/java/android/media/RingtoneManager.java b/media/java/android/media/RingtoneManager.java index 4977391ed5c0..86ebae111029 100644 --- a/media/java/android/media/RingtoneManager.java +++ b/media/java/android/media/RingtoneManager.java @@ -16,10 +16,6 @@ package android.media; -import com.android.internal.database.SortCursor; - -import libcore.io.Streams; - import android.annotation.SdkConstant; import android.annotation.SdkConstant.SdkConstantType; import android.app.Activity; @@ -32,12 +28,15 @@ import android.net.Uri; import android.os.Environment; import android.os.ParcelFileDescriptor; import android.os.Process; -import android.os.RemoteException; import android.provider.MediaStore; import android.provider.Settings; import android.provider.Settings.System; import android.util.Log; +import com.android.internal.database.SortCursor; + +import libcore.io.Streams; + import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -644,7 +643,8 @@ public class RingtoneManager { public static Uri getActualDefaultRingtoneUri(Context context, int type) { String setting = getSettingForType(type); if (setting == null) return null; - final String uriString = Settings.System.getString(context.getContentResolver(), setting); + final String uriString = Settings.System.getStringForUser(context.getContentResolver(), + setting, context.getUserId()); return uriString != null ? Uri.parse(uriString) : null; } @@ -663,8 +663,8 @@ public class RingtoneManager { String setting = getSettingForType(type); if (setting == null) return; - Settings.System.putString(resolver, setting, - ringtoneUri != null ? ringtoneUri.toString() : null); + Settings.System.putStringForUser(resolver, setting, + ringtoneUri != null ? ringtoneUri.toString() : null, context.getUserId()); // Stream selected ringtone into cache so it's available for playback // when CE storage is still locked |