mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-11-19 04:46:08 +00:00
fix: warn about UBWC restart only after a hint is active
This commit is contained in:
1 parent
2e1156038e
commit
e06b942e67
3 files changed
+29
-4
No files matched your search
@@ -55,7 +55,6 @@ internal class DriverMenus(private val activity: Activity, private val ui: Handl
|
||||
private set
|
||||
private var runtimePending by mutableStateOf(false)
|
||||
private var sessionRunning by mutableStateOf(false)
|
||||
private var initialTpUbwcMode: String? = null
|
||||
var tpUbwcMode: String by mutableStateOf(SessionPrefs.TP_UBWC_AUTO)
|
||||
private set
|
||||
|
||||
@@ -77,8 +76,7 @@ internal class DriverMenus(private val activity: Activity, private val ui: Handl
|
||||
canRestart = !sessionRunning,
|
||||
checkedAt = TurnipReleases.cached(activity)?.checkedAt ?: 0L,
|
||||
tpUbwcMode = tpUbwcMode.takeIf { gpu.model == 740 },
|
||||
tpUbwcRestartRequired = (initialTpUbwcMode != null && tpUbwcMode != initialTpUbwcMode) ||
|
||||
com.droiddeck.launcher.gpu.TpUbwcHint.restartRequired(activity),
|
||||
tpUbwcRestartRequired = com.droiddeck.launcher.gpu.TpUbwcHint.restartRequired(activity),
|
||||
)
|
||||
|
||||
fun chooseTpUbwcMode(mode: String) {
|
||||
@@ -137,7 +135,6 @@ internal class DriverMenus(private val activity: Activity, private val ui: Handl
|
||||
|
||||
fun refreshDrivers() {
|
||||
tpUbwcMode = SessionPrefs.tpUbwcMode(activity)
|
||||
if (initialTpUbwcMode == null) initialTpUbwcMode = tpUbwcMode
|
||||
val lm = LinuxVulkanDriverManager(activity)
|
||||
fun origin(id: String) = if (TurnipReleases.isDownloaded(activity, id)) DriverRow.DOWNLOADED else DriverRow.IMPORTED
|
||||
val bundles = DriverBundle.all(activity)
|
||||
|
||||
@@ -6,9 +6,11 @@ import android.os.Handler
|
||||
import android.os.Looper
|
||||
import com.droiddeck.launcher.session.QuestExperimental
|
||||
import com.droiddeck.launcher.session.SessionPrefs
|
||||
import com.droiddeck.launcher.gpu.TpUbwcHint
|
||||
import org.junit.Assert.assertEquals
|
||||
import org.junit.Assert.assertFalse
|
||||
import org.junit.Assert.assertNull
|
||||
import org.junit.Assert.assertTrue
|
||||
import org.junit.Before
|
||||
import org.junit.Test
|
||||
import org.junit.runner.RunWith
|
||||
@@ -17,11 +19,15 @@ import org.robolectric.RobolectricTestRunner
|
||||
import org.robolectric.RuntimeEnvironment
|
||||
import org.robolectric.annotation.Config
|
||||
import org.robolectric.shadows.ShadowBuild
|
||||
import org.robolectric.util.ReflectionHelpers
|
||||
|
||||
@RunWith(RobolectricTestRunner::class)
|
||||
@Config(sdk = [28], manifest = Config.NONE)
|
||||
class DriverMenusAutoTest {
|
||||
@Before fun reset() {
|
||||
ReflectionHelpers.setStaticField(TpUbwcHint::class.java, "resolved", false)
|
||||
ReflectionHelpers.setStaticField(TpUbwcHint::class.java, "cached", null)
|
||||
ReflectionHelpers.setStaticField(TpUbwcHint::class.java, "activeMode", null)
|
||||
RuntimeEnvironment.getApplication().getSharedPreferences("session", Context.MODE_PRIVATE)
|
||||
.edit().clear().commit()
|
||||
ShadowBuild.setModel("Quest 3")
|
||||
@@ -67,4 +73,22 @@ class DriverMenusAutoTest {
|
||||
assertEquals(SessionPrefs.TP_UBWC_ON, menus.tpUbwcMode)
|
||||
assertFalse(menus.state().tpUbwcRestartRequired)
|
||||
}
|
||||
|
||||
@Test fun changingUbwcBeforeTheFirstSessionDoesNotRequireRestart() {
|
||||
val activity = Robolectric.buildActivity(Activity::class.java).setup().get()
|
||||
val menus = DriverMenus(activity, Handler(Looper.getMainLooper()))
|
||||
menus.refreshDrivers()
|
||||
SessionPrefs.setTpUbwcMode(activity, SessionPrefs.TP_UBWC_ON)
|
||||
menus.refreshDrivers()
|
||||
assertFalse(menus.state().tpUbwcRestartRequired)
|
||||
}
|
||||
|
||||
@Test fun recreatingTheMenuKeepsTheActiveHintRestartWarning() {
|
||||
val activity = Robolectric.buildActivity(Activity::class.java).setup().get()
|
||||
TpUbwcHint.forThisDevice(activity)
|
||||
SessionPrefs.setTpUbwcMode(activity, SessionPrefs.TP_UBWC_ON)
|
||||
val menus = DriverMenus(activity, Handler(Looper.getMainLooper()))
|
||||
menus.refreshDrivers()
|
||||
assertTrue(menus.state().tpUbwcRestartRequired)
|
||||
}
|
||||
}
|
||||
@@ -11,6 +11,7 @@ import org.junit.runner.RunWith
|
||||
import org.robolectric.RobolectricTestRunner
|
||||
import org.robolectric.RuntimeEnvironment
|
||||
import org.robolectric.annotation.Config
|
||||
import org.robolectric.util.ReflectionHelpers
|
||||
|
||||
@RunWith(RobolectricTestRunner::class)
|
||||
@Config(sdk = [28], manifest = Config.NONE)
|
||||
@@ -18,6 +19,9 @@ class TpUbwcPrefsTest {
|
||||
private val context: Context get() = RuntimeEnvironment.getApplication()
|
||||
|
||||
@Before fun reset() {
|
||||
ReflectionHelpers.setStaticField(TpUbwcHint::class.java, "resolved", false)
|
||||
ReflectionHelpers.setStaticField(TpUbwcHint::class.java, "cached", null)
|
||||
ReflectionHelpers.setStaticField(TpUbwcHint::class.java, "activeMode", null)
|
||||
context.getSharedPreferences("session", Context.MODE_PRIVATE).edit().clear().commit()
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user