From f75020aa2e93565097cd5e424dd06ef7c1447cba Mon Sep 17 00:00:00 2001
From: An Bui <91354810+AnBui2004@users.noreply.github.com>
Date: Fri, 26 Dec 2025 01:03:14 +0700
Subject: [PATCH] 3.5.2

Supports Qemu 9.2.2 for Android x86.
---
 app/src/main/java/com/vectras/vm/AppConfig.java                | 2 +-
 app/src/main/java/com/vectras/vm/main/core/DisplaySystem.java  | 2 +-
 .../com/vectras/vm/settings/X11DisplaySettingsActivity.java    | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/vectras/vm/AppConfig.java b/app/src/main/java/com/vectras/vm/AppConfig.java
index b34a5b7..f7f07ae 100644
--- a/app/src/main/java/com/vectras/vm/AppConfig.java
+++ b/app/src/main/java/com/vectras/vm/AppConfig.java
@@ -102,7 +102,7 @@ public class AppConfig {
                     " libusbredirparser usbredir-dev sdl2 sdl2-dev sdl2_image-dev libepoxy-dev virglrenderer-dev rdma-core fluxbox" +
                     " libusb libaio ncurses-libs curl libnfs gtk+3.0 gtk+3.0-dev fuse libpulse libseccomp jack pipewire liburing pulseaudio pulseaudio-alsa alsa-plugins-pulse" +
                     " mesa-dri-gallium mesa-vulkan-swrast vulkan-loader mesa-utils mesa-egl" +
-                    " qemu-audio-sdl capstone libcbor snappy lzo ndctl keyutils-libs vde2-libs libdw libbpf sndio-libs linux-pam fuse3-libs libssh vte3";
+                    " qemu-audio-sdl capstone libcbor snappy lzo ndctl keyutils-libs vde2-libs libdw libbpf sndio-libs linux-pam fuse3-libs libssh vte3 libatomic";
         }
     }
 
diff --git a/app/src/main/java/com/vectras/vm/main/core/DisplaySystem.java b/app/src/main/java/com/vectras/vm/main/core/DisplaySystem.java
index 5725c8c..aefe0de 100644
--- a/app/src/main/java/com/vectras/vm/main/core/DisplaySystem.java
+++ b/app/src/main/java/com/vectras/vm/main/core/DisplaySystem.java
@@ -47,7 +47,7 @@ public class DisplaySystem {
     }
 
     public static void launchX11(Context context, boolean isKill) {
-        if (!DeviceUtils.is64bit()) {
+        if (DeviceUtils.isArm() && !DeviceUtils.is64bit()) {
             DialogUtils.oneDialog(
                     context,
                     context.getString(R.string.x11_feature_not_supported),
diff --git a/app/src/main/java/com/vectras/vm/settings/X11DisplaySettingsActivity.java b/app/src/main/java/com/vectras/vm/settings/X11DisplaySettingsActivity.java
index c81fc08..dd784d5 100644
--- a/app/src/main/java/com/vectras/vm/settings/X11DisplaySettingsActivity.java
+++ b/app/src/main/java/com/vectras/vm/settings/X11DisplaySettingsActivity.java
@@ -11,6 +11,7 @@ import androidx.appcompat.app.AppCompatActivity;
 import com.vectras.qemu.MainSettingsManager;
 import com.vectras.vm.R;
 import com.vectras.vm.databinding.ActivityX11DisplaySettingsBinding;
+import com.vectras.vm.utils.DeviceUtils;
 
 import java.util.Objects;
 
@@ -45,7 +46,7 @@ public class X11DisplaySettingsActivity extends AppCompatActivity {
 
         binding.lnPreferences.setOnClickListener(v -> {
             Intent intent = new Intent();
-            if (SDK_INT >= 34) {
+            if (SDK_INT >= 34 || !DeviceUtils.isArm()) {
                 intent.setClassName("com.termux.x11", "com.termux.x11.MainActivity");
                 intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                 intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK);