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
This commit is contained in:
MaxsTechReview authored and GitHub committed 2026-11-07 21:47:04 -05:00
1 parent 2ade269be3
commit 914b3588e1
4 files changed
+68 -1

No files matched your search

@@ -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)
@@ -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"))