Merge "Resolve ringtone Uris using Context user." into nyc-dev

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;

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;

    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;

    }

        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