From e0b3f928a68677cdd50f9c580bf1480dc44eaaf6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Resul=20=C3=96v=C3=BCr?= <92828257+ovurrsl@users.noreply.github.com> Date: Thu, 22 Oct 2026 06:56:43 +0300 Subject: [PATCH] fix: auto-driver trial rolls back when the display driver crashes at startup (#1031) --- .../com/droiddeck/launcher/SessionActivity.kt | 5 ++++- .../droiddeck/launcher/gpu/AutoDriverTrial.kt | 17 ++++++++++++--- .../launcher/gpu/AutoDriverTrialTest.kt | 21 +++++++++++++++++++ 3 files changed, 39 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 41486b38fc..e7c3385d30 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -1600,7 +1600,10 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { val turnip = TurnipDriver(this) com.droiddeck.launcher.gpu.DriverSetupLog.write(this, "surface.driver-setup") - if (!CompositorHost.isStarted) CompositorHost.displayChoice = SessionPrefs.androidDriver(this) + if (!CompositorHost.isStarted) { + CompositorHost.displayChoice = SessionPrefs.androidDriver(this) + com.droiddeck.launcher.gpu.AutoDriverTrial.displayStarting(this, SessionPrefs.androidDriver(this)) + } val driverId = if (CompositorHost.isStarted) null else turnip.install() val previous = SessionState.outputSize diff --git a/app/src/main/java/com/droiddeck/launcher/gpu/AutoDriverTrial.kt b/app/src/main/java/com/droiddeck/launcher/gpu/AutoDriverTrial.kt index 751ab8298d..a63a802497 100644 --- a/app/src/main/java/com/droiddeck/launcher/gpu/AutoDriverTrial.kt +++ b/app/src/main/java/com/droiddeck/launcher/gpu/AutoDriverTrial.kt @@ -28,7 +28,7 @@ object AutoDriverTrial { release, p.getString("name", "").orEmpty(), p.getString("display", "").orEmpty(), p.getString("linux", "").orEmpty(), p.getString("previousDisplay", "").orEmpty(), p.getString("previousLinux", "").orEmpty(), - p.getInt("starts", 0), + maxOf(p.getInt("starts", 0), p.getInt("displayStarts", 0)), ) } @@ -37,7 +37,7 @@ object AutoDriverTrial { .putString("release", release).putString("name", name) .putString("display", display).putString("linux", linux) .putString("previousDisplay", previousDisplay).putString("previousLinux", previousLinux) - .putInt("starts", 0) + .putInt("starts", 0).putInt("displayStarts", 0) .commit() } @@ -48,13 +48,24 @@ object AutoDriverTrial { fun bad(context: Context): Set = prefs(context).getStringSet("bad", emptySet()).orEmpty() + /** + * Counted before the compositor loads the trial display driver, so a driver that kills the process during + * Vulkan init still counts towards a rollback; sessionStarting runs too late for that. + */ + fun displayStarting(context: Context, display: String) { + val p = prefs(context) + if (p.getString("release", null) == null || p.getString("display", "") != display) return + val counted = maxOf(p.getInt("displayStarts", 0), p.getInt("starts", 0)) + p.edit().putInt("displayStarts", counted + 1).commit() + } + fun sessionStarting(context: Context, display: String, linux: String) { val trial = current(context) watching = null if (trial == null || trial.display != display || trial.linux != linux) return app = context.applicationContext watching = trial - prefs(context).edit().putInt("starts", trial.starts + 1).commit() + prefs(context).edit().putInt("starts", prefs(context).getInt("starts", 0) + 1).commit() } fun sessionReady() { diff --git a/app/src/test/java/com/droiddeck/launcher/gpu/AutoDriverTrialTest.kt b/app/src/test/java/com/droiddeck/launcher/gpu/AutoDriverTrialTest.kt index d38d96b3f9..c9a0fa7b4c 100644 --- a/app/src/test/java/com/droiddeck/launcher/gpu/AutoDriverTrialTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/gpu/AutoDriverTrialTest.kt @@ -62,4 +62,25 @@ class AutoDriverTrialTest { assertNull(AutoDriverTrial.rollbackDue(context)) assertEquals("banner@r5", AutoDriverTrial.current(context)?.release) } + + @Test fun displayDriverCrashesBeforeSessionStartStillCount() { + AutoDriverTrial.displayStarting(context, "new-display") + assertNull(AutoDriverTrial.rollbackDue(context)) + AutoDriverTrial.displayStarting(context, "new-display") + assertEquals(2, AutoDriverTrial.rollbackDue(context)?.starts) + } + + @Test fun aNormalStartIsCountedOnce() { + AutoDriverTrial.displayStarting(context, "new-display") + AutoDriverTrial.sessionStarting(context, "new-display", "new-linux") + assertEquals(1, AutoDriverTrial.current(context)?.starts) + AutoDriverTrial.displayStarting(context, "other-display") + assertEquals(1, AutoDriverTrial.current(context)?.starts) + } + + @Test fun aTrialStartedBeforeDisplayCountingStillRollsBackOnTheNextCrash() { + AutoDriverTrial.sessionStarting(context, "new-display", "new-linux") + AutoDriverTrial.displayStarting(context, "new-display") + assertEquals(2, AutoDriverTrial.rollbackDue(context)?.starts) + } }