From 914b3588e1ec1fe300838c2ceca65f343717a2e0 Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Sat, 7 Nov 2026 21:47:04 -0500 Subject: [PATCH] fix(drivers): leaving a driver bundle no longer keeps its runtime half, and the Auto display picks the latest pair (#2255) * fix(drivers): leaving a driver bundle's display half also drops its runtime half Picking either half of an Android + Linux bundle selects both, but picking another display driver afterwards changed only the display. The session kept loading the bundle's Linux driver, so switching back to DroidDeck's drivers could still leave the session failing to start. The runtime driver now goes back to the default when the display leaves the active bundle; a runtime driver chosen on its own is kept. * fix(drivers): picking the Auto display hands both halves to Auto's latest DD-Turnip pair * fix(drivers): the Auto display pick puts the display on Auto even when no pair fits the GPU --- .../com/droiddeck/launcher/DriverMenus.kt | 10 ++++++- .../droiddeck/launcher/gpu/DriverBundle.kt | 6 +++++ .../droiddeck/launcher/DriverMenusAutoTest.kt | 26 ++++++++++++++++++ .../launcher/gpu/DriverBundleTest.kt | 27 +++++++++++++++++++ 4 files changed, 68 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/droiddeck/launcher/DriverMenus.kt b/app/src/main/java/com/droiddeck/launcher/DriverMenus.kt index 669aad4e67..be0af56a06 100644 --- a/app/src/main/java/com/droiddeck/launcher/DriverMenus.kt +++ b/app/src/main/java/com/droiddeck/launcher/DriverMenus.kt @@ -603,11 +603,19 @@ internal class DriverMenus(private val activity: Activity, private val ui: Handl } fun selectDriver(id: String, linux: Boolean) { + if (!linux && id == TurnipDriver.AUTO) { + DriverBundle.selectDisplay(activity, id) + pairModeOpen = false + lastAutoCheck = 0L + setMode(auto = true) + refreshDrivers() + return + } val bundle = DriverBundle.containing(activity, id, linux) when { bundle != null -> useBundle(bundle) linux -> SessionPrefs.setLinuxDriver(activity, id) - else -> SessionPrefs.setAndroidDriver(activity, id) + else -> DriverBundle.selectDisplay(activity, id) } pairModeOpen = false setMode(auto = false, mix = true) diff --git a/app/src/main/java/com/droiddeck/launcher/gpu/DriverBundle.kt b/app/src/main/java/com/droiddeck/launcher/gpu/DriverBundle.kt index 594dbebb27..319a123811 100644 --- a/app/src/main/java/com/droiddeck/launcher/gpu/DriverBundle.kt +++ b/app/src/main/java/com/droiddeck/launcher/gpu/DriverBundle.kt @@ -159,6 +159,12 @@ object DriverBundle { SessionPrefs.setLinuxDriver(context, bundle.linuxId) } + fun selectDisplay(context: Context, id: String) { + val left = active(context) + SessionPrefs.setAndroidDriver(context, id) + if (left != null && left.androidId != id) SessionPrefs.setLinuxDriver(context, "") + } + fun remove(context: Context, bundle: Bundle) { TurnipDriver(context).remove(bundle.androidId) LinuxVulkanDriverManager(context).removeDriver(bundle.linuxId) diff --git a/app/src/test/java/com/droiddeck/launcher/DriverMenusAutoTest.kt b/app/src/test/java/com/droiddeck/launcher/DriverMenusAutoTest.kt index 0e15c04dba..923c1f41fd 100644 --- a/app/src/test/java/com/droiddeck/launcher/DriverMenusAutoTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/DriverMenusAutoTest.kt @@ -7,6 +7,7 @@ import android.os.Looper import com.droiddeck.launcher.session.QuestExperimental import com.droiddeck.launcher.session.SessionPrefs import com.droiddeck.launcher.gpu.TpUbwcHint +import com.droiddeck.launcher.gpu.TurnipDriver import org.junit.Assert.assertEquals import org.junit.Assert.assertFalse import org.junit.Assert.assertNull @@ -34,6 +35,31 @@ class DriverMenusAutoTest { ShadowBuild.setDevice("eureka") } + @Test fun pickingTheAutoDisplayHandsBothHalvesToAuto() { + val activity = Robolectric.buildActivity(Activity::class.java).setup().get() + SessionPrefs.setGpuDriverMode(activity, SessionPrefs.GPU_DRIVERS_MIX) + SessionPrefs.setAndroidDriver(activity, "chosen-display") + SessionPrefs.setLinuxDriver(activity, "chosen-linux") + val menus = DriverMenus(activity, Handler(Looper.getMainLooper())) + menus.selectDriver(TurnipDriver.AUTO, linux = false) + assertEquals(SessionPrefs.GPU_DRIVERS_AUTO, SessionPrefs.gpuDriverMode(activity)) + assertEquals(QuestExperimental.DRIVER, SessionPrefs.androidDriver(activity)) + assertEquals("", SessionPrefs.linuxDriver(activity)) + } + + @Test fun pickingTheAutoDisplayWithNoPairForTheGpuStillPutsTheDisplayOnAuto() { + ShadowBuild.setModel("Generic phone") + ShadowBuild.setDevice("generic") + val activity = Robolectric.buildActivity(Activity::class.java).setup().get() + SessionPrefs.setGpuDriverMode(activity, SessionPrefs.GPU_DRIVERS_MIX) + SessionPrefs.setAndroidDriver(activity, "chosen-display") + SessionPrefs.setLinuxDriver(activity, "chosen-linux") + DriverMenus(activity, Handler(Looper.getMainLooper())).selectDriver(TurnipDriver.AUTO, linux = false) + assertEquals(SessionPrefs.GPU_DRIVERS_AUTO, SessionPrefs.gpuDriverMode(activity)) + assertEquals(TurnipDriver.AUTO, SessionPrefs.androidDriver(activity)) + assertEquals("chosen-linux", SessionPrefs.linuxDriver(activity)) + } + @Test fun selectingAutoUsesTheQuestPairWithoutStartingADownload() { val activity = Robolectric.buildActivity(Activity::class.java).setup().get() SessionPrefs.setGpuDriverMode(activity, SessionPrefs.GPU_DRIVERS_MANUAL) diff --git a/app/src/test/java/com/droiddeck/launcher/gpu/DriverBundleTest.kt b/app/src/test/java/com/droiddeck/launcher/gpu/DriverBundleTest.kt index b9c0ce819b..24d47f60e4 100644 --- a/app/src/test/java/com/droiddeck/launcher/gpu/DriverBundleTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/gpu/DriverBundleTest.kt @@ -101,6 +101,33 @@ class DriverBundleTest { assertTrue(DriverBundle.all(context).isEmpty()) } + @Test fun aDisplayPickedAwayFromABundleTakesItsRuntimeHalfWithIt() { + val b = DriverBundle.install(context, bundle()) + DriverBundle.select(context, b) + DriverBundle.selectDisplay(context, TurnipDriver.AUTO) + assertEquals(TurnipDriver.AUTO, SessionPrefs.androidDriver(context)) + assertEquals("", SessionPrefs.linuxDriver(context)) + assertNull(DriverBundle.active(context)) + + DriverBundle.select(context, b) + DriverBundle.selectDisplay(context, "turnip25.1.0") + assertEquals("turnip25.1.0", SessionPrefs.androidDriver(context)) + assertEquals("", SessionPrefs.linuxDriver(context)) + } + + @Test fun aDisplayPickOutsideABundleKeepsTheChosenRuntime() { + SessionPrefs.setLinuxDriver(context, "my-linux-driver") + SessionPrefs.setAndroidDriver(context, "turnip25.1.0") + DriverBundle.selectDisplay(context, TurnipDriver.AUTO) + assertEquals(TurnipDriver.AUTO, SessionPrefs.androidDriver(context)) + assertEquals("my-linux-driver", SessionPrefs.linuxDriver(context)) + + val b = DriverBundle.install(context, bundle()) + DriverBundle.select(context, b) + DriverBundle.selectDisplay(context, b.androidId) + assertEquals(b.linuxId, SessionPrefs.linuxDriver(context)) + } + @Test fun aRefusedHalfLeavesNothingInstalled() { try { DriverBundle.install(context, bundle(linuxLibc = "libc.so"))