Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6695525f authored by guofei.xue's avatar guofei.xue Committed by Jean-Michel Trivi
Browse files

Use the try catch to deal with the StaleDataException. 

When test the monkey, the mCursor is not null and the mCursor is Closed.
So that the mCursor cannot call the method of moveToPosition. Otherwise
it will lead to StaleDataException.

In order to prevent the android.database.StaleDataException and IllegalStateException,
use the try catch to deal with the StaleDataException and IllegalStateException.

Test:Perform the monkey test, and See if this android.database.StaleDataException will happen again when call the method of android.media.RingtoneManager#getRingtoneUri.

Bug: 169292273

Change-Id: I577c41c6a4b0025ce562a2dc495a6f28b103cfaa
parent aea9e7c1

media/java/android/media/RingtoneManager.java

+7 −1
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import android.content.pm.PackageManager.NameNotFoundException; 
import android.content.pm.UserInfo;

import android.content.res.AssetFileDescriptor;

import android.database.Cursor;

import android.database.StaleDataException;

import android.net.Uri;

import android.os.Environment;

import android.os.FileUtils;
@@ -492,9 +493,14 @@ public class RingtoneManager { 
    public Uri getRingtoneUri(int position) {

        // use cursor directly instead of requerying it, which could easily

        // cause position to shuffle.

        try {

            if (mCursor == null || !mCursor.moveToPosition(position)) {

                return null;

            }

        } catch (StaleDataException | IllegalStateException e) {

            Log.e(TAG, "Unexpected Exception has been catched.", e);

            return null;

        }



        return getUriFromCursor(mContext, mCursor);

    }