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

Merge "RingtoneManager: Don't crash if the ringtone doesn't have a numerical ID" am: ff78aab391

Browse Source 
Change-Id: Ia4af051076066cb3cd66cb5d95162339b989dad4
This commit is contained in:
Automerger Merge Worker
2020-02-18 22:06:22 +00:00
parent 28c43860ea ff78aab391
commit 0396aae65b
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -509,15 +509,19 @@ public class RingtoneManager {
* @return The position of the {@link Uri}, or -1 if it cannot be found. * @return The position of the {@link Uri}, or -1 if it cannot be found.
*/ */
public int getRingtonePosition(Uri ringtoneUri) { public int getRingtonePosition(Uri ringtoneUri) {
if (ringtoneUri == null) return -1; try {
final long ringtoneId = ContentUris.parseId(ringtoneUri); 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)) { if (ringtoneId == cursor.getLong(ID_COLUMN_INDEX)) {
return cursor.getPosition(); return cursor.getPosition();
}
} }
} catch (NumberFormatException e) {
Log.e(TAG, "NumberFormatException while getting ringtone position, returning -1", e);
} }
return -1; return -1;
} }