| commit | f40ef350b4f04daa2287f8a4142e478851f6d09a | [log] [tgz] |
|---|---|---|
| author | Jake Klinker <jklinker@google.com> | Thu Oct 07 04:53:55 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Oct 07 04:53:55 2021 +0000 |
| tree | c0f780d2e5e108f06de1c8d8e2cbd790c44783d6 | |
| parent | 5062902b35499a88ebb7cb721101bad592b35ecb [diff] | |
| parent | 56bacbcb13093191748551c2cbdc4133ba60ec77 [diff] |
Convert URI scheme to lower case before checking if it is a file. am: 56bacbcb13 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/15998907 Change-Id: I708af5f19396bfcbbd6ee0ccea4f38c19c3c4dae
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); } /**