From 32c0f19df639f43b98ea7fc7a8be066babb31473 Mon Sep 17 00:00:00 2001 From: Lubos Date: Thu, 10 Nov 2022 22:16:36 +0100 Subject: [PATCH] OpenXR - Freezing on Pico 4 fixed --- android/src/org/ppsspp/ppsspp/CameraHelper.java | 3 +++ android/src/org/ppsspp/ppsspp/NativeActivity.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/android/src/org/ppsspp/ppsspp/CameraHelper.java b/android/src/org/ppsspp/ppsspp/CameraHelper.java index d324d50819..9fdb270606 100644 --- a/android/src/org/ppsspp/ppsspp/CameraHelper.java +++ b/android/src/org/ppsspp/ppsspp/CameraHelper.java @@ -159,6 +159,9 @@ class CameraHelper { static ArrayList getDeviceList() { ArrayList deviceList = new ArrayList<>(); + if (NativeActivity.isVRDevice()) { + return deviceList; + } int nrCam = Camera.getNumberOfCameras(); for (int index = 0; index < nrCam; index++) { try { diff --git a/android/src/org/ppsspp/ppsspp/NativeActivity.java b/android/src/org/ppsspp/ppsspp/NativeActivity.java index 8727f39dc3..07a80dae19 100644 --- a/android/src/org/ppsspp/ppsspp/NativeActivity.java +++ b/android/src/org/ppsspp/ppsspp/NativeActivity.java @@ -1557,7 +1557,7 @@ public abstract class NativeActivity extends Activity { } } - private boolean isVRDevice() { + public static boolean isVRDevice() { return BuildConfig.FLAVOR.startsWith("vr_"); } }