Merge Android 12 QPR1

Bug: 210511427
Merged-In: Id864894b14fd0ab784a093ec203d31200c933f88
Change-Id: I1402358d4ef814caff2bb76bed71541c3a5ead64
This commit is contained in:
Xin Li
2021-12-13 21:43:03 -08:00

View File

@@ -94,8 +94,12 @@ public class UriUtil {
return TextUtils.equals(scheme, ContentResolver.SCHEME_ANDROID_RESOURCE); return TextUtils.equals(scheme, ContentResolver.SCHEME_ANDROID_RESOURCE);
} }
/** Returns whether the given Uri is a file. */
public static boolean isFileUri(final Uri uri) { public static boolean isFileUri(final Uri uri) {
return uri != null && TextUtils.equals(uri.getScheme(), ContentResolver.SCHEME_FILE); return uri != null &&
uri.getScheme() != null &&
TextUtils.equals(uri.getScheme().toLowerCase(),
ContentResolver.SCHEME_FILE);
} }
/** /**