Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix inconsistency in ringtone list" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-06-14 15:33:35 +00:00
committed by Android (Google) Code Review
parent f7730d7ed7 d9b89825b7
commit 49be55d145
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
media/java/android/media/RingtoneManager.java
View File

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