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 am: 0396aae65b

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

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

@@ -509,6 +509,7 @@ 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) {
try {
if (ringtoneUri == null) return -1; if (ringtoneUri == null) return -1;
final long ringtoneId = ContentUris.parseId(ringtoneUri); final long ringtoneId = ContentUris.parseId(ringtoneUri);
@@ -519,6 +520,9 @@ public class RingtoneManager {
return cursor.getPosition(); return cursor.getPosition();
} }
} }
} catch (NumberFormatException e) {
Log.e(TAG, "NumberFormatException while getting ringtone position, returning -1", e);
}
return -1; return -1;
} }