From dab1a3aa3cdd4f7c0fc317339c3ef8c19f412153 Mon Sep 17 00:00:00 2001
From: "Unknown W. Brackets" <checkins@unknownbrackets.org>
Date: Mon, 13 Sep 2021 10:27:42 -0700
Subject: [PATCH] Android: Fix UI background on scoped storage.

---
 .../src/org/ppsspp/ppsspp/NativeActivity.java | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/android/src/org/ppsspp/ppsspp/NativeActivity.java b/android/src/org/ppsspp/ppsspp/NativeActivity.java
index 221fce3296..b62af3fbc3 100644
--- a/android/src/org/ppsspp/ppsspp/NativeActivity.java
+++ b/android/src/org/ppsspp/ppsspp/NativeActivity.java
@@ -1120,13 +1120,20 @@ public abstract class NativeActivity extends Activity {
 		if (requestCode == RESULT_LOAD_IMAGE) {
 			Uri selectedImage = data.getData();
 			if (selectedImage != null) {
-				String[] filePathColumn = {MediaStore.Images.Media.DATA};
-				Cursor cursor = getContentResolver().query(selectedImage, filePathColumn, null, null, null);
-				cursor.moveToFirst();
-				int columnIndex = cursor.getColumnIndex(filePathColumn[0]);
-				String picturePath = cursor.getString(columnIndex);
-				cursor.close();
-				NativeApp.sendMessage("bgImage_updated", picturePath);
+				if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+					NativeApp.sendMessage("bgImage_updated", selectedImage.toString());
+				} else {
+					String[] filePathColumn = {MediaStore.Images.Media.DATA};
+					Cursor cursor = getContentResolver().query(selectedImage, filePathColumn, null, null, null);
+					if (cursor != null) {
+						cursor.moveToFirst();
+						int columnIndex = cursor.getColumnIndex(filePathColumn[0]);
+						String picturePath = cursor.getString(columnIndex);
+						cursor.close();
+
+						NativeApp.sendMessage("bgImage_updated", picturePath);
+					}
+				}
 			}
 		} else if (requestCode == RESULT_OPEN_DOCUMENT) {
 			Uri selectedFile = data.getData();