Merge "RingtoneManager: verify default ringtone is audio" into rvc-dev (0e3093b2) · Commits · e / os / android_frameworks_base

media/java/android/media/RingtoneManager.java

+17 −2

Original line number	Original line	Diff line number	Diff line
	@@ -819,6 +819,21 @@ public class RingtoneManager {
	if(!isInternalRingtoneUri(ringtoneUri)) {		if(!isInternalRingtoneUri(ringtoneUri)) {
	ringtoneUri = ContentProvider.maybeAddUserId(ringtoneUri, context.getUserId());		ringtoneUri = ContentProvider.maybeAddUserId(ringtoneUri, context.getUserId());
	}		}

			if (ringtoneUri != null) {
			final String mimeType = resolver.getType(ringtoneUri);
			if (mimeType == null) {
			Log.e(TAG, "setActualDefaultRingtoneUri for URI:" + ringtoneUri
			+ " ignored: failure to find mimeType (no access from this context?)");
			return;
			}
			if (!(mimeType.startsWith("audio/") \|\| mimeType.equals("application/ogg"))) {
			Log.e(TAG, "setActualDefaultRingtoneUri for URI:" + ringtoneUri
			+ " ignored: associated mimeType:" + mimeType + " is not an audio type");
			return;
			}
			}

	Settings.System.putStringForUser(resolver, setting,		Settings.System.putStringForUser(resolver, setting,
	ringtoneUri != null ? ringtoneUri.toString() : null, context.getUserId());		ringtoneUri != null ? ringtoneUri.toString() : null, context.getUserId());