commit cfdbf4ef2395b3e03ea8f739b743a87601351319
author Treehugger Robot <treehugger-gerrit@google.com> Mon Jun 14 13:11:29 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jun 14 13:11:29 2021 +0000
tree a087d83a9032a28f07dddadfad6ff9db6096ab80
parent 05081aa3b0849e07134d0a9147d4f85b58dfe91d
parent 19035013809706bd9f62cef3cede84841306ecbb

Merge "Fix inconsistency in ringtone list"

media/java/android/media/RingtoneManager.java

diff --git a/media/java/android/media/RingtoneManager.java b/media/java/android/media/RingtoneManager.java
index e2e13b0..be6ff1b 100644
--- a/media/java/android/media/RingtoneManager.java
+++ b/media/java/android/media/RingtoneManager.java
@@ -521,12 +521,12 @@
     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();
                 }
             }