diff options
| -rw-r--r-- | core/java/android/content/ContentResolver.java | 6 | ||||
| -rw-r--r-- | media/java/android/media/RingtoneManager.java | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/core/java/android/content/ContentResolver.java b/core/java/android/content/ContentResolver.java index 00f1e43c8493..5f34f1b2bc0d 100644 --- a/core/java/android/content/ContentResolver.java +++ b/core/java/android/content/ContentResolver.java @@ -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, diff --git a/media/java/android/media/RingtoneManager.java b/media/java/android/media/RingtoneManager.java index e207721f1918..77f756baa1f2 100644 --- a/media/java/android/media/RingtoneManager.java +++ b/media/java/android/media/RingtoneManager.java @@ -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); } /** |