Merge "Fix inconsistency in ringtone list" into sc-dev am: 49be55d145

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14965492

Change-Id: I6781130b0adb4b572ede45ef68341e4f11a835c2

media/java/android/media/RingtoneManager.java

@@ -521,12 +521,12 @@ public class RingtoneManager {
     public int getRingtonePosition(Uri ringtoneUri) {
         try {
             if (ringtoneUri == null) return -1;
-            final long ringtoneId = ContentUris.parseId(ringtoneUri);
 
             final Cursor cursor = getCursor();
             cursor.moveToPosition(-1);
             while (cursor.moveToNext()) {
-                if (ringtoneId == cursor.getLong(ID_COLUMN_INDEX)) {
+                Uri uriFromCursor = getUriFromCursor(mContext, cursor);
+                if (ringtoneUri.equals(uriFromCursor)) {
                     return cursor.getPosition();
                 }
             }