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

Merge "Canonicalize default ringtones." into qt-dev

Browse Source
This commit is contained in:
Jeff Sharkey
2019-04-18 03:45:01 +00:00
committed by Android (Google) Code Review
parent 285f6ffff9 6378402da1
commit db44ba1e85
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/content/ContentResolver.java
View File

@@ -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,

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

@@ -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);
}
/**