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

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

Merge "Canonicalize default ringtones." into qt-dev

parents 285f6fff 6378402d

core/java/android/content/ContentResolver.java

+6 −0
Original line number Diff line number Diff line
@@ -981,6 +981,12 @@ public abstract class ContentResolver implements ContentInterface { 
        }

    }



    /** {@hide} */

    public final @NonNull Uri canonicalizeOrElse(@NonNull Uri uri) {

        final Uri res = canonicalize(uri);

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

    }



    /**

     * Transform the given <var>url</var> to a canonical representation of

     * its referenced resource, which can be used across devices, persisted,

media/java/android/media/RingtoneManager.java

+1 −2
Original line number Diff line number Diff line
@@ -502,8 +502,7 @@ public class RingtoneManager { 
    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;

        return context.getContentResolver().canonicalizeOrElse(uri);

    }



    /**