Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Resolve ringtone Uris using Context user." into nyc-dev am: 2478f36428

Browse Source 
am: 6aefc85def

* commit '6aefc85def6e6bab3dac457a24a424237ac4e427':
  Resolve ringtone Uris using Context user.
This commit is contained in:
Jeff Sharkey
2016-03-09 22:11:33 +00:00
committed by android-build-merger
parent 175cb175df 6aefc85def
commit 1c6871e8e4
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
media/java/android/media/RingtoneManager.java
View File

@@ -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