feat(v1.20): overlay label + best-effort force-stop under blackout + 120ms poll + detection-lag logs

Author: alex-hermes-agent

app/build.gradle.kts

@@ -15,8 +15,8 @@ android {
         applicationId = "com.alexk.tvlock"
         minSdk = 21
         targetSdk = 34
-        versionCode = 20
-        versionName = "1.19"
+        versionCode = 21
+        versionName = "1.20"
     }
 
     if (!releaseKeystore.isNullOrBlank()) {

app/src/main/java/com/alexk/tvlock/GateOverlay.kt

@@ -48,13 +48,23 @@ object GateOverlay {
         }
         try {
             wm = context.getSystemService(Context.WINDOW_SERVICE) as WindowManager
-            val black = object : View(context) {
+            val root = object : android.widget.FrameLayout(context) {
                 override fun onKeyDown(keyCode: Int, event: KeyEvent): Boolean = true
                 override fun onKeyUp(keyCode: Int, event: KeyEvent): Boolean = true
                 override fun onTouchEvent(event: MotionEvent): Boolean = true
             }
-            black.isFocusable = true
-            black.isFocusableInTouchMode = true
+            val label = android.widget.TextView(context).apply {
+                text = context.getString(R.string.overlay_locked)
+                setTextColor(Color.WHITE)
+                textSize = 28f
+                gravity = android.view.Gravity.CENTER
+            }
+            root.addView(label, android.widget.FrameLayout.LayoutParams(
+                android.widget.FrameLayout.LayoutParams.WRAP_CONTENT,
+                android.widget.FrameLayout.LayoutParams.WRAP_CONTENT,
+                android.view.Gravity.CENTER))
+            root.isFocusable = true
+            root.isFocusableInTouchMode = true
             val type = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
                 WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY
             else
@@ -69,10 +79,10 @@ object GateOverlay {
                     WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS or
                     WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON,
                 PixelFormat.OPAQUE)
-            black.setBackgroundColor(Color.BLACK)
-            wm!!.addView(black, lp)
-            black.requestFocus()
-            view = black
+            root.setBackgroundColor(Color.BLACK)
+            wm!!.addView(root, lp)
+            root.requestFocus()
+            view = root
             shownAt = now
             android.util.Log.i("TVLOCK", "blackout overlay shown")
         } catch (e: Exception) {

app/src/main/java/com/alexk/tvlock/LockPollService.kt

@@ -139,6 +139,10 @@ class LockPollService : Service() {
         }
         unlockUntil = Prefs(this).unlockUntil()
         if (t in blocked && foregroundChanged && now >= unlockUntil) {
+            // evTs = the event's own timestamp; now-evTs = how late UsageStats
+            // surfaced it to us. This is the detection gap the overlay has to
+            // beat on a fast dedicated-button press.
+            android.util.Log.i("TVLOCK", "detect lag=${now - evTs}ms pkg=$t")
             raiseGate(t, now)
         }
     }
@@ -147,6 +151,8 @@ class LockPollService : Service() {
         gateUp = true
         gateRaisedAt = now
         targetPkg = t
+        // detection latency log: evTs->now tells us how late the UsageStats
+        // event itself is; (now - gateRaisedAt) at the hide tells gate launch lag
         android.util.Log.i("TVLOCK", "gate raising for $t")
         try {
             // instant blackout FIRST: paints in <100 ms from the service and
@@ -159,6 +165,27 @@ class LockPollService : Service() {
                          Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS or
                          Intent.FLAG_ACTIVITY_SINGLE_TOP)
             })
+            // Kill the app underneath the blackout: even if the profile picker
+            // rendered before the overlay landed, taps cannot reach it and no
+            // video can start. Safe to do because onUnlocked() relaunches the
+            // app by package after a correct PIN. Guarded by gateUp so a fast
+            // unlock (gateUp=false before this fires) never kills the app the
+            // user is legitimately opening.
+            handler.postDelayed({
+                if (gateUp && targetPkg == t) {
+                    try {
+                        val am = Class.forName("android.app.ActivityManager")
+                            .getMethod("getService").invoke(null)
+                        am.javaClass.getMethod("forceStopPackage", String::class.java, Int::class.java)
+                            .invoke(am, t, 0)
+                        android.util.Log.i("TVLOCK", "force-stopped $t under blackout")
+                    } catch (e: Exception) {
+                        // hidden API blocked on this ROM (likely on API 34) — the
+                        // blackout + gate still protect; this is best-effort only
+                        android.util.Log.w("TVLOCK", "force-stop unavailable: ${e.javaClass.simpleName}")
+                    }
+                }
+            }, 500)
             // Cooldown window opens now (gate visible on the launch path / or when
             // the watchdog re-arms after seeing it on top, see tick()).
             recoveryReadyAt = now + RECOVERY_COOLDOWN_MS
@@ -237,7 +264,7 @@ class LockPollService : Service() {
     override fun onBind(intent: Intent?): IBinder? = null
 
     companion object {
-        const val POLL_MS = 250L
+        const val POLL_MS = 120L
         const val GATE_CONFIRM_MS = 2_500L
         // Cooldown window for the watchdog recovery re-raise, measured from the
         // last raise. The 2.5 s watchdog check paces it to >= 2.5 s anyway; this

app/src/main/res/values-uk/strings.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="locked_title">🔒 Захищений додаток</string>
+    <string name="overlay_locked">⏳ Завантажую екран блокування…</string>
     <string name="pin_hint">Введіть PIN з пульта (4 цифри)</string>
     <string name="wrong_pin">Невірний PIN</string>
     <string name="unlocked">Розблоковано</string>

app/src/main/res/values/strings.xml

@@ -3,6 +3,7 @@
     <string name="app_title">TV App Lock</string>
     <string name="service_description">TV App Lock</string>
     <string name="locked_title">🔒 Protected app</string>
+    <string name="overlay_locked">⏳ Loading lock screen…</string>
     <string name="pin_hint">Enter the 4-digit PIN with your remote</string>
     <string name="wrong_pin">Wrong PIN</string>
     <string name="unlocked">Unlocked</string>