Merge changes I7907f0a3,Iec46c80b am: 4d233a83b7 am: 60d7707016 am: 0ca8b033dd... (1d0f0eca) · Commits · e / os / android_frameworks_base

media/java/android/media/Ringtone.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -372,7 +372,7 @@ public class Ringtone {
		AudioAttributes.toLegacyStreamType(mAudioAttributes)) != 0) {
		startLocalPlayer();
		}
		} else if (mAllowRemote && (mRemotePlayer != null)) {
		} else if (mAllowRemote && (mRemotePlayer != null) && (mUri != null)) {
		final Uri canonicalUri = mUri.getCanonicalUri();
		final boolean looping;
		final float volume;

+13 −2

Original line number	Diff line number	Diff line
		@@ -1130,11 +1130,13 @@ public class RingtoneManager {

		// Try finding the scanned ringtone
		final String filename = getDefaultRingtoneFilename(type);
		final String whichAudio = getQueryStringForType(type);
		final String where = MediaColumns.DISPLAY_NAME + "=? AND " + whichAudio + "=?";
		final Uri baseUri = MediaStore.Audio.Media.INTERNAL_CONTENT_URI;
		try (Cursor cursor = context.getContentResolver().query(baseUri,
		new String[] { MediaColumns._ID },
		MediaColumns.DISPLAY_NAME + "=?",
		new String[] { filename }, null)) {
		where,
		new String[] { filename, "1" }, null)) {
		if (cursor.moveToFirst()) {
		final Uri ringtoneUri = context.getContentResolver().canonicalizeOrElse(
		ContentUris.withAppendedId(baseUri, cursor.getLong(0)));
		@@ -1162,4 +1164,13 @@ public class RingtoneManager {
		default: throw new IllegalArgumentException();
		}
		}

		private static String getQueryStringForType(int type) {
		switch (type) {
		case TYPE_RINGTONE: return MediaStore.Audio.AudioColumns.IS_RINGTONE;
		case TYPE_NOTIFICATION: return MediaStore.Audio.AudioColumns.IS_NOTIFICATION;
		case TYPE_ALARM: return MediaStore.Audio.AudioColumns.IS_ALARM;
		default: throw new IllegalArgumentException();
		}
		}
		}