Merge branch 'main' into upscaler-setting

This commit is contained in:
Kurt Himebauch authored and GitHub committed 2026-10-02 23:25:35 -04:00
commit a8f421c396
27 files changed
+1810 -200

No files matched your search

@@ -32,12 +32,14 @@ object SessionFiles {
"libfakeinput.so" to "usr/local/lib/libfakeinput.so",
"libblfastpath.so" to "usr/local/lib/libblfastpath.so",
"usr/local/bin/bannerlator-session" to "usr/local/bin/bannerlator-session",
"usr/local/bin/droiddeck-clipboard" to "usr/local/bin/droiddeck-clipboard",
"usr/local/bin/bannerlator-steam-compat" to "usr/local/bin/bannerlator-steam-compat",
"usr/local/bin/bannerlator-steam-install" to "usr/local/bin/bannerlator-steam-install",
"usr/local/bin/bannerlator-steam-library" to "usr/local/bin/bannerlator-steam-library",
"usr/local/bin/bannerlator-seed-redists" to "usr/local/bin/bannerlator-seed-redists",
"usr/local/bin/bannerlator-proton-extra" to "usr/local/bin/bannerlator-proton-extra",
"usr/local/bin/bannerlator-netmanager" to "usr/local/bin/bannerlator-netmanager",
"usr/local/bin/bannerlator-login1" to "usr/local/bin/bannerlator-login1",
"usr/local/bin/bannerlator-steam-launch" to "usr/local/bin/bannerlator-steam-launch",
"usr/local/bin/bannerlator-desktop-games" to "usr/local/bin/bannerlator-desktop-games",
"usr/local/bin/bannerlator-steam-shim" to "usr/local/bin/bannerlator-steam-shim",
@@ -220,6 +220,19 @@ object SessionPrefs {
prefs(context).edit().putBoolean("mic", on).apply()
}
/** Optional SSID reporting and scans. A Location grant alone never opts the user in. */
fun wifiDiscoveryEnabled(context: Context): Boolean = prefs(context).getBoolean("wifiDiscovery", false)
fun setWifiDiscoveryEnabled(context: Context, on: Boolean) {
prefs(context).edit().putBoolean("wifiDiscovery", on).apply()
}
fun wifiDiscoveryAsked(context: Context): Boolean = prefs(context).getBoolean("wifiDiscoveryAsked", false)
fun setWifiDiscoveryAsked(context: Context) {
prefs(context).edit().putBoolean("wifiDiscoveryAsked", true).apply()
}
/**
* Whether the client's own core pick is overridden. When on, BL_CLIENT_CPUS is sent even when
* it names every core - unlike a game mask, the point here is to undo a pin Steam applies to
@@ -74,6 +74,8 @@ class SessionService : Service() {
private var activityVisible = true
private var screenOn = true
private var manualPauseRequested = false
/** An explicit Steam sleep request is independent of the background policy. */
private var steamSleepToken: String? = null
private var suspendOperationPending = false
private var suspendAttemptFailed = false
private var screenReceiverRegistered = false
@@ -84,6 +86,7 @@ class SessionService : Service() {
Intent.ACTION_SCREEN_ON -> screenOn = true
else -> return
}
if (screenOn) resumeSteamSleepOnReturn()
suspendAttemptFailed = false
updateSuspendPolicy()
}
@@ -139,6 +142,7 @@ class SessionService : Service() {
}
ACTION_ACTIVITY_VISIBLE -> {
activityVisible = true
resumeSteamSleepOnReturn()
suspendAttemptFailed = false
updateSuspendPolicy()
return START_NOT_STICKY
@@ -160,6 +164,7 @@ class SessionService : Service() {
activityVisible = true
screenOn = (getSystemService(Context.POWER_SERVICE) as? PowerManager)?.isInteractive ?: screenOn
manualPauseRequested = false
completeSteamSleep()
suspendAttemptFailed = false
updateSuspendPolicy()
return START_NOT_STICKY
@@ -177,6 +182,7 @@ class SessionService : Service() {
activityVisible = true
screenOn = (getSystemService(Context.POWER_SERVICE) as? PowerManager)?.isInteractive ?: true
manualPauseRequested = false
steamSleepToken = null
suspendOperationPending = false
suspendAttemptFailed = false
suspendController = null
@@ -514,6 +520,7 @@ class SessionService : Service() {
guest.add("XDG_RUNTIME_DIR=" + LinuxRuntime.GUEST_RUNTIME_DIR)
guest.add("XDG_SESSION_TYPE=wayland")
guest.add("WAYLAND_DISPLAY=wayland-0")
guest.add("BL_ANDROID_CLIPBOARD=" + File(filesDir, "session/android-clipboard").path)
guest.add("GAMESCOPE_FORCE_GENERAL_QUEUE=1")
// Steam's CEF needs GL and the rootfs ships no native GL driver: route it through Zink.
guest.add("MESA_LOADER_DRIVER_OVERRIDE=zink")
@@ -937,9 +944,26 @@ class SessionService : Service() {
private fun watchLaunchRequests(dir: File) {
launchWatcher?.stopWatching()
listOf("steam-sleep", "steam-sleep-state", "steam-sleep-ready").forEach { File(dir, it).delete() }
val gen = sessionGen
@Suppress("DEPRECATION")
val watcher = object : android.os.FileObserver(dir.path, CLOSE_WRITE or MOVED_TO) {
override fun onEvent(event: Int, path: String?) {
if (path == "steam-sleep") {
val request = File(dir, path)
val token = runCatching { request.readText().trim() }.getOrNull() ?: return
request.delete()
if (!token.matches(Regex("[a-f0-9]{32}"))) return
mainHandler.post {
if (gen != sessionGen || !SessionState.running) return@post
steamSleepToken = token
writeSteamSleepState(token, "paused")
suspendAttemptFailed = false
Log.i(TAG, "Steam requested session sleep")
updateSuspendPolicy()
}
return
}
if (path != "steam-launch") return
val file = File(dir, path)
val text = try { file.readText() } catch (e: Exception) { return }
@@ -974,18 +998,23 @@ class SessionService : Service() {
if (suspendPolicy == SessionPrefs.SUSPEND_MANUAL && (!activityVisible || !screenOn)) {
manualPauseRequested = true
}
val shouldSuspend = when (suspendPolicy) {
val shouldSuspend = steamSleepToken != null || when (suspendPolicy) {
SessionPrefs.SUSPEND_AUTO -> !activityVisible || !screenOn
SessionPrefs.SUSPEND_MANUAL -> manualPauseRequested
else -> false
}
val controller = suspendController ?: return
if (suspendOperationPending || suspendAttemptFailed || shouldSuspend == SessionState.suspended) return
val gen = sessionGen
suspendOperationPending = true
SessionEvents.record(if (shouldSuspend) "session.suspend_requested" else "session.resume_requested", mapOf(
"policy" to suspendPolicy, "activityVisible" to activityVisible,
"screenOn" to screenOn, "steamSleep" to (steamSleepToken != null),
))
if (shouldSuspend) {
controller.freeze { success ->
mainHandler.post {
if (!SessionState.running) return@post
if (gen != sessionGen || !SessionState.running) return@post
suspendOperationPending = false
if (success) {
SessionState.suspended = true
@@ -993,6 +1022,7 @@ class SessionService : Service() {
releaseLocks()
refreshNotification()
} else {
completeSteamSleep()
suspendAttemptFailed = true
Log.w(TAG, "could not confirm that the session stopped")
}
@@ -1003,7 +1033,7 @@ class SessionService : Service() {
acquireLocks()
controller.resume { success ->
mainHandler.post {
if (!SessionState.running) return@post
if (gen != sessionGen || !SessionState.running) return@post
suspendOperationPending = false
if (success) {
SessionState.suspended = false
@@ -1019,6 +1049,27 @@ class SessionService : Service() {
}
}
private fun writeSteamSleepState(token: String, state: String) {
val dir = LinuxRuntime.sessionRoot(this)
runCatching {
val staged = File(dir, "steam-sleep-state.tmp")
staged.writeText("$token:$state\n")
check(staged.renameTo(File(dir, "steam-sleep-state")))
}.onFailure { Log.w(TAG, "could not acknowledge Steam sleep", it) }
}
private fun completeSteamSleep() {
val token = steamSleepToken ?: return
// Write before SIGCONT: the guest's login1 sees it immediately on thaw
// and delivers PrepareForSleep(false), restoring Steam's main surface.
writeSteamSleepState(token, "awake")
steamSleepToken = null
}
private fun resumeSteamSleepOnReturn() {
if (suspendPolicy == SessionPrefs.SUSPEND_AUTO && activityVisible && screenOn) completeSteamSleep()
}
private fun finishSessionStop(status: Int, stoppedGen: Int) {
mainHandler.post {
if (stoppedGen != sessionGen || SessionState.running) {