Merge "Fix inconsistency in ringtone list" am: cfdbf4ef23 am: 1bb0151638

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

Change-Id: Ia19fde00e6d9d1207111081445ddb8f5f3069ac5

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();
                 }
             }