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

Merge "Use the try catch to deal with the StaleDataException." am: 1fa847ad64 am: 15698dd32d am: 4b16237ab7

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

Change-Id: I3013edfee1921ce0dce503355d0c866e345e7538
This commit is contained in:
Jean-Michel Trivi
2020-09-29 23:29:59 +00:00
committed by Automerger Merge Worker
parent 7d08fa0c21 4b16237ab7
commit d715c91c2a
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,6 +34,7 @@ import android.content.pm.PackageManager.NameNotFoundException;
import android.content.pm.UserInfo; import android.content.pm.UserInfo;
import android.content.res.AssetFileDescriptor; import android.content.res.AssetFileDescriptor;
import android.database.Cursor; import android.database.Cursor;
import android.database.StaleDataException;
import android.net.Uri; import android.net.Uri;
import android.os.Environment; import android.os.Environment;
import android.os.FileUtils; import android.os.FileUtils;
@@ -492,9 +493,14 @@ public class RingtoneManager {
public Uri getRingtoneUri(int position) { public Uri getRingtoneUri(int position) {
// use cursor directly instead of requerying it, which could easily // use cursor directly instead of requerying it, which could easily
// cause position to shuffle. // cause position to shuffle.
try {
if (mCursor == null || !mCursor.moveToPosition(position)) { if (mCursor == null || !mCursor.moveToPosition(position)) {
return null; return null;
} }
} catch (StaleDataException | IllegalStateException e) {
Log.e(TAG, "Unexpected Exception has been catched.", e);
return null;
}
return getUriFromCursor(mContext, mCursor); return getUriFromCursor(mContext, mCursor);
} }