Merge Android 12L

Bug: 222710654
Merged-In: I0f76e316e9e7f504b92e157799074e4c5606adbf
Change-Id: Idad44c9d2adeb6207c021dcf5aa29049fee9020e
This commit is contained in:
Xin Li
2022-03-08 00:19:21 +00:00

View File

@@ -98,7 +98,7 @@ public class UriUtil {
public static boolean isFileUri(final Uri uri) { public static boolean isFileUri(final Uri uri) {
return uri != null && return uri != null &&
uri.getScheme() != null && uri.getScheme() != null &&
TextUtils.equals(uri.getScheme().toLowerCase(), TextUtils.equals(uri.getScheme().trim().toLowerCase(),
ContentResolver.SCHEME_FILE); ContentResolver.SCHEME_FILE);
} }