summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2022-01-05 21:41:03 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2022-01-05 21:41:03 +0000
commitae592708451d7c58b046257af2642d809e3d063b (patch)
tree34a6ce02673a874c3593e1e7d5f60ffcebe60277
parent86c5bba80d89be977f0d5c141fd139a2a82b3957 (diff)
parent0acea168f86f938bc99d872a79558b46e4b61c39 (diff)
downloadGallery2-ae592708451d7c58b046257af2642d809e3d063b.tar.gz
Merge "AOSP/Gallery2 - Disable copying of arbitrary private file of Gallery2 into External Storage."
-rw-r--r--src/com/android/gallery3d/data/UriImage.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/data/UriImage.java b/src/com/android/gallery3d/data/UriImage.java
index b3fe1de03..0e5cd2a3f 100644
--- a/src/com/android/gallery3d/data/UriImage.java
+++ b/src/com/android/gallery3d/data/UriImage.java
@@ -37,6 +37,7 @@ import java.io.FileNotFoundException;
import java.io.InputStream;
import java.net.URI;
import java.net.URL;
+import java.util.Locale;
public class UriImage extends MediaItem {
private static final String TAG = "UriImage";
@@ -91,7 +92,7 @@ public class UriImage extends MediaItem {
}
private int openOrDownloadInner(JobContext jc) {
- String scheme = mUri.getScheme();
+ String scheme = mUri.getScheme().toLowerCase(Locale.ENGLISH);
if (ContentResolver.SCHEME_CONTENT.equals(scheme)
|| ContentResolver.SCHEME_ANDROID_RESOURCE.equals(scheme)
|| ContentResolver.SCHEME_FILE.equals(scheme)) {