Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918

Bug: 205056467 Merged-In: I54b996561d0248a4636e0991545cbfc0700e1ee4 Change-Id: Id864894b14fd0ab784a093ec203d31200c933f88
2021-11-10 08:06:09 +00:00
parent 476671be4a 8a9e12764a
commit 6aa775678a
1 changed files with 5 additions and 1 deletions
@@ -94,8 +94,12 @@ public class UriUtil {
        return TextUtils.equals(scheme, ContentResolver.SCHEME_ANDROID_RESOURCE);
    }

+    /** Returns whether the given Uri is a file. */
    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);
    }

    /**