Use UriUtil when checking if a URI is a file.

UriUtil.isFileUri contains several additional fixes, so this ensure that existing instances where we check for the file scheme use this method as well. This covers all existing instances in the app of SCHEME_FILE.

Change-Id: I1f3131b33823eae3e620aa9608be8e72b2e84aa2
Bug: 215212561
This commit is contained in:
Jake Klinker
2022-01-31 20:21:06 +00:00
parent a0332cba4f
commit ebc64c5bae
3 changed files with 4 additions and 8 deletions

View File

@@ -480,7 +480,7 @@ public class ImageUtils {
if (MediaScratchFileProvider.isMediaScratchSpaceUri(mUri)) {
inputFilePath = MediaScratchFileProvider.getFileFromUri(mUri).getAbsolutePath();
} else {
if (!TextUtils.equals(mUri.getScheme(), ContentResolver.SCHEME_FILE)) {
if (!UriUtil.isFileUri(mUri)) {
Assert.fail("Expected a GIF file uri, but actual uri = " + mUri.toString());
}
inputFilePath = mUri.getPath();