| commit | 8a9e12764a9f0b59f008b7524de3bfda4a94373d | [log] [tgz] |
|---|---|---|
| author | Jake Klinker <jklinker@google.com> | Thu Oct 07 05:33:56 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Oct 07 05:33:56 2021 +0000 |
| tree | c0f780d2e5e108f06de1c8d8e2cbd790c44783d6 | |
| parent | db5364911fd3bfebef112ccfa73c9e1a32a0fe96 [diff] | |
| parent | 58ee29c68e1914af680ef0658bdb7a94e4e5e3a3 [diff] |
Convert URI scheme to lower case before checking if it is a file. am: 58ee29c68e Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/15998887 Change-Id: I54b996561d0248a4636e0991545cbfc0700e1ee4
diff --git a/src/com/android/messaging/util/UriUtil.java b/src/com/android/messaging/util/UriUtil.java index d336167..1d6a1be 100644 --- a/src/com/android/messaging/util/UriUtil.java +++ b/src/com/android/messaging/util/UriUtil.java
@@ -94,8 +94,12 @@ 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); } /**