Merge remote-tracking branch 'origin/5.15' into dev

 Conflicts:
	src/widgets/widgets/qabstractbutton.cpp
	src/widgets/widgets/qbuttongroup.cpp
	src/widgets/widgets/qbuttongroup.h
	src/widgets/widgets/qsplashscreen.cpp
	tests/auto/widgets/widgets/qbuttongroup/tst_qbuttongroup.cpp
        tests/benchmarks/opengl/main.cpp

  Needed update:
	src/plugins/platforms/cocoa/CMakeLists.txt

Change-Id: I7be4baebb63844ec2b3e0de859ca9de1bc730bb5

1 files changed, 6 insertions, 1 deletions

diff --git a/src/android/jar/src/org/qtproject/qt5/android/QtNative.java b/src/android/jar/src/org/qtproject/qt5/android/QtNative.java
index dba407c0b1..b9457af6ef 100644
--- a/src/android/jar/src/org/qtproject/qt5/android/QtNative.java
+++ b/src/android/jar/src/org/qtproject/qt5/android/QtNative.java
@@ -162,8 +162,13 @@ public class QtNative
     private static Uri getUriWithValidPermission(Context context, String uri, String openMode)
     {
         try {
+            Uri parsedUri = Uri.parse(uri);
+            String scheme = parsedUri.getScheme();
+            // We only want to check permissions for files and content Uris
+            if (scheme.compareTo("file") != 0 && scheme.compareTo("content") != 0)
+                return parsedUri;
             List<UriPermission> permissions = context.getContentResolver().getPersistedUriPermissions();
-            String uriStr = Uri.parse(uri).getPath();
+            String uriStr = parsedUri.getPath();
 
             for (int i = 0; i < permissions.size(); ++i) {
                 Uri iterUri = permissions.get(i).getUri();