Shizuku stability, IME bubble dual-mode, Samsung USB advisory#42
Merged
Conversation
Addresses repeated Shizuku death on Samsung (FreecessController kills shell-UID processes aggressively, taking both shizuku_server and the single-layer watchdog with it). Users had to re-run wireless-debugging setup every time the hotspot transition killed the server. New resilience stack: - Dual-layer watchdog (outer supervises inner; inner supervises shizuku_server) spawned with nohup+setsid for session detachment. - Heartbeat file written every 5s; 15s staleness threshold triggers reinstall. - Best-effort fortification: doze whitelist, appops RUN_ANY/IN_BG, oom_score_adj = -900 on shizuku_server and the watchdogs. - Staged rollback-safe install: write .new scripts, rename, teardown old processes via PID-file + exact argv-element cmdline match, spawn outer, verify. - ShellDiag marker protocol (__STEP_BEGIN__/__STEP_END__ rc=$?) so stdout-only IPC can recover per-step exit codes and fail fast. - Exact argv-element cmdline validation via tr '\0' '\n' | grep -Fxq (no substring or space-boundary heuristics). - Single synchronized entrypoint ensureShizukuHardened() called from MainActivity and MirrorForegroundService. - Legacy single-script watchdog cleanup via /proc/*/cmdline enumeration. - SHIZUKU_FORTIFIED diagnostic event (informational; classifier ignores). 45 unit tests: 21 new for ShellDiag + ShizukuHealth, 3 regression tests for DisconnectCauseClassifier's treatment of the new event. Reviewed via DUUL (plan + code phases, approved). Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
- Acquire WIFI_MODE_FULL_HIGH_PERF lock in ShizukuSetup so wireless ADB does not get torn down by the radio sleeping on screen-off (fixes the AdbDebuggingManager "Network disconnected. Disabling adbwifi" cascade that killed Shizuku within 1-10s of lock). - Add quick-death counter: if the binder dies <15s after being received 3 times in a row, stop auto-relaunching the Shizuku manager and post a high-priority ongoing notification telling the user to plug USB back in or keep the screen on. Avoids an infinite relaunch loop on OEM kill. - Add client-side frame-arrival watchdog so a silently stalled video socket (Shizuku death, encoder stall, VD end) no longer freezes the last frame on screen. - Relocate Home / density / playback-profile controls into a collapsible overlay menu to tidy the on-screen chrome. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
Samsung's Default USB Configuration = File Transfer (MTP/PTP) causes the OS to restart USB on every screen lock, killing Shizuku. Detect the misconfig at startup and prompt the user to switch to Charging only, with a shortcut to Developer Options. Respects a don't-show-again flag. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
Single-VD mode: rely on the global IME state (mInputShown / mShowRequested) alone so the bubble only appears when the phone keyboard actually shows. The dumpsys window imeInputTarget fallback is reserved for true Samsung dual-VD where cross-display focus mismatch makes the global state lie. Add a 200ms hide watchdog while the bubble is visible so it disappears as soon as the keyboard dismisses, and a browser→server bubbleClosed signal that suppresses the hasTarget fallback until the user re-engages, so a user-dismissed bubble doesn't immediately re-open. Also move the split ratio controls into the overlay menu panel instead of the separate floating toolbar/tap-zone. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
After an install/update (including adb install -r with no version bump), shizuku_server holds a cached user-service record pointing at our previous process's binder. Without intervention, the next bindUserService call either never delivers onServiceConnected or connects then immediately disconnects — the symptom users see as "Shizuku not responding until I restart the manager". Detect reinstall by comparing PackageInfo.lastUpdateTime against a saved SharedPreferences value on init, and when they differ call unbindUserService(args, conn, remove=true) before the first bind so the stale record is wiped. Also watch the user-service ServiceConnection: sessions that end within 3s of connecting trigger one automatic force unbind-rebind (capped at two retries) to cover the case where the stale record slipped past detection. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
|
The latest updates on your projects. Learn more about Vercel for GitHub.
|
This was referenced Apr 24, 2026
Suprhimp
added a commit
that referenced
this pull request
Apr 24, 2026
* Harden Shizuku against OEM kills with dual-layer watchdog Addresses repeated Shizuku death on Samsung (FreecessController kills shell-UID processes aggressively, taking both shizuku_server and the single-layer watchdog with it). Users had to re-run wireless-debugging setup every time the hotspot transition killed the server. New resilience stack: - Dual-layer watchdog (outer supervises inner; inner supervises shizuku_server) spawned with nohup+setsid for session detachment. - Heartbeat file written every 5s; 15s staleness threshold triggers reinstall. - Best-effort fortification: doze whitelist, appops RUN_ANY/IN_BG, oom_score_adj = -900 on shizuku_server and the watchdogs. - Staged rollback-safe install: write .new scripts, rename, teardown old processes via PID-file + exact argv-element cmdline match, spawn outer, verify. - ShellDiag marker protocol (__STEP_BEGIN__/__STEP_END__ rc=$?) so stdout-only IPC can recover per-step exit codes and fail fast. - Exact argv-element cmdline validation via tr '\0' '\n' | grep -Fxq (no substring or space-boundary heuristics). - Single synchronized entrypoint ensureShizukuHardened() called from MainActivity and MirrorForegroundService. - Legacy single-script watchdog cleanup via /proc/*/cmdline enumeration. - SHIZUKU_FORTIFIED diagnostic event (informational; classifier ignores). 45 unit tests: 21 new for ShellDiag + ShizukuHealth, 3 regression tests for DisconnectCauseClassifier's treatment of the new event. Reviewed via DUUL (plan + code phases, approved). Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * Hold Shizuku alive across screen-off via WifiLock + loop defense - Acquire WIFI_MODE_FULL_HIGH_PERF lock in ShizukuSetup so wireless ADB does not get torn down by the radio sleeping on screen-off (fixes the AdbDebuggingManager "Network disconnected. Disabling adbwifi" cascade that killed Shizuku within 1-10s of lock). - Add quick-death counter: if the binder dies <15s after being received 3 times in a row, stop auto-relaunching the Shizuku manager and post a high-priority ongoing notification telling the user to plug USB back in or keep the screen on. Avoids an infinite relaunch loop on OEM kill. - Add client-side frame-arrival watchdog so a silently stalled video socket (Shizuku death, encoder stall, VD end) no longer freezes the last frame on screen. - Relocate Home / density / playback-profile controls into a collapsible overlay menu to tidy the on-screen chrome. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * Advise on Samsung USB config that kills Shizuku on screen lock Samsung's Default USB Configuration = File Transfer (MTP/PTP) causes the OS to restart USB on every screen lock, killing Shizuku. Detect the misconfig at startup and prompt the user to switch to Charging only, with a shortcut to Developer Options. Respects a don't-show-again flag. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * Mirror phone keyboard visibility strictly in the input bubble Single-VD mode: rely on the global IME state (mInputShown / mShowRequested) alone so the bubble only appears when the phone keyboard actually shows. The dumpsys window imeInputTarget fallback is reserved for true Samsung dual-VD where cross-display focus mismatch makes the global state lie. Add a 200ms hide watchdog while the bubble is visible so it disappears as soon as the keyboard dismisses, and a browser→server bubbleClosed signal that suppresses the hasTarget fallback until the user re-engages, so a user-dismissed bubble doesn't immediately re-open. Also move the split ratio controls into the overlay menu panel instead of the separate floating toolbar/tap-zone. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * Recover Shizuku user-service from token mismatch after reinstall After an install/update (including adb install -r with no version bump), shizuku_server holds a cached user-service record pointing at our previous process's binder. Without intervention, the next bindUserService call either never delivers onServiceConnected or connects then immediately disconnects — the symptom users see as "Shizuku not responding until I restart the manager". Detect reinstall by comparing PackageInfo.lastUpdateTime against a saved SharedPreferences value on init, and when they differ call unbindUserService(args, conn, remove=true) before the first bind so the stale record is wiped. Also watch the user-service ServiceConnection: sessions that end within 3s of connecting trigger one automatic force unbind-rebind (capped at two retries) to cover the case where the stale record slipped past detection. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.7 <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Supersedes #41 (closed as a side-effect of renaming the branch from
devplanningo/shizuku-stability→shizuku-stability; all commits preserved). Adds IME bubble dual-mode fix and Shizuku token-mismatch recovery on top of the original scope.Summary
Shizuku OEM-kill hardening
shizuku_serveralive through Samsung-class OEM kills.WIFI_MODE_FULL_HIGH_PERFWifiLock so the radio doesn't sleep on screen-off, preventing theAdbDebuggingManager "Network disconnected. Disabling adbwifi"cascade that killed Shizuku within 1-10s of lock on Galaxy Flip.Shizuku token mismatch after reinstall (new)
adb install -rwith no version bump), shizuku_server holds a stale user-service record pointing at the previous process's dead binder. The nextbindUserServiceeither never deliversonServiceConnectedor connects then immediately disconnects.PackageInfo.lastUpdateTimevs. a saved SharedPrefs value on init; when they differ, callunbindUserService(args, conn, remove=true)before the first bind so the stale record is wiped.ServiceConnection: sessions that end within 3s trigger one automatic force unbind-rebind (capped at two retries) to cover cases the reinstall detector missed.Samsung USB config advisory (new)
persist.sys.usb.configat startup and surface a dialog prompting the user to switch to "Charging only", with a shortcut to Developer Options. Respects a don't-show-again flag.IME bubble mirrors phone keyboard visibility strictly
mInputShown/mShowRequested) alone, so the bubble only appears when the phone keyboard actually shows. Thedumpsys windowimeInputTargetfallback is gated to true Samsung dual-VD where cross-display focus mismatch makes the global state lie.bubbleClosedsignal from browser → server suppresses thehasTargetfallback until the user re-engages (touch-down on the mirror), so a user-dismissed bubble doesn't immediately re-open.Misc
Test plan
./gradlew :app:assembleDebuggreen./gradlew :app:testDebugUnitTest— Shizuku + utils tests pass (ShizukuReinstallDetectorTest,UsbConfigCheckerTest,ImeTargetParserTest)ShizukuWifiLock acquiredconfirmed in logcat; noNetwork disconnected. Disabling adbwifievent.adb install -rreinstall flow:Reinstall detected (saved=... current=...) — force unbind before first bindlogged; user service reconnects without manual Shizuku-manager restart.goHomethe previous app isam force-stopped; only the active app's process remains on the VD.🤖 Generated with Claude Code