Merge "RingtoneManager: Don't crash if the ringtone doesn't have a numerical ID" am: ff78aab391 (0396aae6) · Commits · e / os / android_frameworks_base

media/java/android/media/RingtoneManager.java

+12 −8

Original line number	Diff line number	Diff line
		@@ -509,6 +509,7 @@ public class RingtoneManager {
		* @return The position of the {@link Uri}, or -1 if it cannot be found.
		*/
		public int getRingtonePosition(Uri ringtoneUri) {
		try {
		if (ringtoneUri == null) return -1;
		final long ringtoneId = ContentUris.parseId(ringtoneUri);

		@@ -519,6 +520,9 @@ public class RingtoneManager {
		return cursor.getPosition();
		}
		}
		} catch (NumberFormatException e) {
		Log.e(TAG, "NumberFormatException while getting ringtone position, returning -1", e);
		}
		return -1;
		}