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

Commit 715c495a authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge "Canonicalize ringtones before returning." into qt-dev

parents fd9a858a aaa19ced

media/java/android/media/RingtoneManager.java

+9 −7
Original line number Diff line number Diff line
@@ -496,12 +496,14 @@ public class RingtoneManager { 
            return null;

        }



        return getUriFromCursor(mCursor);

        return getUriFromCursor(mContext, mCursor);

    }



    private static Uri getUriFromCursor(Cursor cursor) {

        return ContentUris.withAppendedId(Uri.parse(cursor.getString(URI_COLUMN_INDEX)), cursor

                .getLong(ID_COLUMN_INDEX));

    private static Uri getUriFromCursor(Context context, Cursor cursor) {

        final Uri uri = ContentUris.withAppendedId(Uri.parse(cursor.getString(URI_COLUMN_INDEX)),

                cursor.getLong(ID_COLUMN_INDEX));

        final Uri canonicalized = context.getContentResolver().canonicalize(uri);

        return (canonicalized != null) ? canonicalized : uri;

    }



    /**
@@ -569,7 +571,7 @@ public class RingtoneManager { 
            Uri uri = null;

            

            if (cursor.moveToFirst()) {

                uri = getUriFromCursor(cursor);

                uri = getUriFromCursor(context, cursor);

            }

            cursor.close();